From 3154c28ad778afeb3f037e875372a451fd0a51de Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov
Date: Mon, 25 Sep 2017 13:39:39 +0300
Subject: Bug 522718 - Remove mozilla leftovers

Change-Id: I91e21254f9bef6fa893cbbbed24d7dc3957745e2
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
---
 .../common/org/eclipse/swt/browser/WebBrowser.java   | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

(limited to 'bundles/org.eclipse.swt/Eclipse SWT Browser')

diff --git a/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/WebBrowser.java b/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/WebBrowser.java
index df7f31745e..df4bd0c5e2 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/WebBrowser.java	
+++ b/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/WebBrowser.java	
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2003, 2016 IBM Corporation and others.
+ * Copyright (c) 2003, 2017 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -35,12 +35,11 @@ abstract class WebBrowser {
 	static final String EXECUTE_ID = "SWTExecuteTemporaryFunction"; // $NON-NLS-1$
 
 	static List<String[]> NativePendingCookies = new ArrayList<> ();
-	static List<String[]> MozillaPendingCookies = new ArrayList<> ();
 	static String CookieName, CookieValue, CookieUrl;
 	static boolean CookieResult;
-	static Runnable MozillaClearSessions, NativeClearSessions;
-	static Runnable MozillaGetCookie, NativeGetCookie;
-	static Runnable MozillaSetCookie, NativeSetCookie;
+	static Runnable NativeClearSessions;
+	static Runnable NativeGetCookie;
+	static Runnable NativeSetCookie;
 
 	/* Key Mappings */
 	static final int [][] KeyTable = {
@@ -261,13 +260,11 @@ public abstract boolean back ();
 
 public static void clearSessions () {
 	if (NativeClearSessions != null) NativeClearSessions.run ();
-	if (MozillaClearSessions != null) MozillaClearSessions.run ();
 }
 
 public static String GetCookie (String name, String url) {
 	CookieName = name; CookieUrl = url; CookieValue = null;
 	if (NativeGetCookie != null) NativeGetCookie.run ();
-	if (CookieValue == null && MozillaGetCookie != null) MozillaGetCookie.run ();
 	String result = CookieValue;
 	CookieName = CookieValue = CookieUrl = null;
 	return result;
@@ -283,13 +280,6 @@ public static boolean SetCookie (String value, String url, boolean addToPending)
 			NativePendingCookies.add (new String[] {value, url});
 		}
 	}
-	if (MozillaSetCookie != null) {
-		MozillaSetCookie.run ();
-	} else {
-		if (addToPending && MozillaPendingCookies != null) {
-			MozillaPendingCookies.add (new String[] {value, url});
-		}
-	}
 	CookieValue = CookieUrl = null;
 	return CookieResult;
 }
@@ -411,7 +401,7 @@ public Object evaluate (String script, boolean trusted) throws SWTException {
 
 public Object evaluate (String script) throws SWTException {
 	// Developer note:
-	// Webkit1 & Mozilla use this mechanism.
+	// Webkit1 uses this mechanism.
 	// Webkit2 uses a different mechanism. See WebKit:evaluate();
 	BrowserFunction function = new EvaluateFunction (browser, ""); // $NON-NLS-1$
 	int index = getNextFunctionIndex ();
-- 
cgit v1.2.3