Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kurtakov2017-09-25 10:39:39 +0000
committerAlexander Kurtakov2017-09-25 10:39:39 +0000
commit3154c28ad778afeb3f037e875372a451fd0a51de (patch)
tree08b885d0b291b35aeee11a52eacd1043a1416a39 /bundles/org.eclipse.swt/Eclipse SWT Browser
parent00720b46e1bebb3f6d678aaeece1a01bc020b17f (diff)
downloadeclipse.platform.swt-3154c28ad778afeb3f037e875372a451fd0a51de.tar.gz
eclipse.platform.swt-3154c28ad778afeb3f037e875372a451fd0a51de.tar.xz
eclipse.platform.swt-3154c28ad778afeb3f037e875372a451fd0a51de.zip
Bug 522718 - Remove mozilla leftovers
Change-Id: I91e21254f9bef6fa893cbbbed24d7dc3957745e2 Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT Browser')
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/WebBrowser.java20
1 files changed, 5 insertions, 15 deletions
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 ();

Back to the top