Bug 350098 - [hovering] "Enrich on click" is not working

13 files changed, 156 insertions, 69 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/Browser.java b/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/Browser.java
index 3e7a4acca9..9948cf5e14 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/Browser.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/Browser.java
@@ -632,6 +632,9 @@ public String getBrowserType () {
 /**
  * Returns <code>true</code> if javascript will be allowed to run in pages
  * subsequently viewed in the receiver, and <code>false</code> otherwise.
+ * Note that this may not reflect the javascript enablement on the currently-
+ * viewed page if <code>setJavascriptEnabled()</code> has been invoked during
+ * its lifetime.
  *
  * @return the receiver's javascript enabled state
  *
@@ -646,7 +649,7 @@ public String getBrowserType () {
  */
 public boolean getJavascriptEnabled () {
 	checkWidget();
-	return webBrowser.jsEnabled;
+	return webBrowser.jsEnabledOnNextPage;
 }
 
 public int getStyle () {
@@ -972,8 +975,7 @@ public void removeVisibilityWindowListener (VisibilityWindowListener listener) {
  */
 public void setJavascriptEnabled (boolean enabled) {
 	checkWidget();
-	webBrowser.jsEnabled = enabled;
-	webBrowser.jsEnabledChanged = true;
+	webBrowser.jsEnabledOnNextPage = enabled;
 }
 
 /**
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 d3ac919656..e69773bd86 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
@@ -26,7 +26,7 @@ abstract class WebBrowser {
 	StatusTextListener[] statusTextListeners = new StatusTextListener[0];
 	TitleListener[] titleListeners = new TitleListener[0];
 	VisibilityWindowListener[] visibilityWindowListeners = new VisibilityWindowListener[0];
-	boolean jsEnabledChanged, jsEnabled = true;
+	boolean jsEnabledOnNextPage = true, jsEnabled = true;
 	int nextFunctionIndex = 1;
 	Object evaluateResult;
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Browser/win32/org/eclipse/swt/browser/IE.java b/bundles/org.eclipse.swt/Eclipse SWT Browser/win32/org/eclipse/swt/browser/IE.java
index a312752748..f1c407e6be 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Browser/win32/org/eclipse/swt/browser/IE.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Browser/win32/org/eclipse/swt/browser/IE.java
@@ -656,6 +656,8 @@ public void create(Composite parent, int style) {
 						break;
 					}
 					case NavigateComplete2: {
+						jsEnabled = jsEnabledOnNextPage;
+
 						Variant varResult = event.arguments[1];
 						String url = varResult.getString();
 						if (!performingInitialNavigate) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Mozilla.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Mozilla.java
index eff03b2ebc..c4ed39d3de 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Mozilla.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Mozilla.java
@@ -4364,9 +4364,8 @@ int OnStartURIOpen (int /*long*/ aURI, int /*long*/ retval) {
 			}
 
 			if (doit) {
-				if (jsEnabledChanged) {
-					jsEnabledChanged = false;
-	
+				if (jsEnabled != jsEnabledOnNextPage) {
+					jsEnabled = jsEnabledOnNextPage;
 					int /*long*/[] result = new int /*long*/[1];
 					int rc = webBrowser.QueryInterface (nsIWebBrowserSetup.NS_IWEBBROWSERSETUP_IID, result);
 					if (rc != XPCOM.NS_OK) error (rc);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/carbon/org/eclipse/swt/browser/WebKit.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/carbon/org/eclipse/swt/browser/WebKit.java
index b824c7b503..10090df8e8 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/carbon/org/eclipse/swt/browser/WebKit.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/carbon/org/eclipse/swt/browser/WebKit.java
@@ -1865,8 +1865,8 @@ void decidePolicyForNavigationAction(int actionInformation, int request, int fra
 			}
 		}
 		if (newEvent.doit) {
-			if (jsEnabledChanged) {
-				jsEnabledChanged = false;
+			if (jsEnabled != jsEnabledOnNextPage) {
+				jsEnabled = jsEnabledOnNextPage;
 				if (preferences == 0) {
 					preferences = Cocoa.objc_msgSend (Cocoa.C_WebPreferences, Cocoa.S_alloc);
 					Cocoa.objc_msgSend (preferences, Cocoa.S_init);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/cocoa/org/eclipse/swt/browser/WebKit.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/cocoa/org/eclipse/swt/browser/WebKit.java
index 6da746ac1d..473960fde8 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/cocoa/org/eclipse/swt/browser/WebKit.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/cocoa/org/eclipse/swt/browser/WebKit.java
@@ -1494,8 +1494,8 @@ void webView_decidePolicyForNavigationAction_request_frame_decisionListener(int
 		}
 	}
 	if (newEvent.doit) {
-		if (jsEnabledChanged) {
-			jsEnabledChanged = false;
+		if (jsEnabled != jsEnabledOnNextPage) {
+			jsEnabled = jsEnabledOnNextPage;
 			if (preferences == null) {
 				preferences = (WebPreferences)new WebPreferences ().alloc ().init ();
 				webView.setPreferences (preferences);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.c b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.c
index 0d8b934041..caa86065d6 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.c
@@ -2004,6 +2004,26 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1title)
 }
 #endif
 
+#ifndef NO__1webkit_1web_1view_1get_1type
+JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1type)
+	(JNIEnv *env, jclass that)
+{
+	jintLong rc = 0;
+	WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1get_1type_FUNC);
+/*
+	rc = (jintLong)webkit_web_view_get_type();
+*/
+	{
+		WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_get_type)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)();
+		}
+	}
+	WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1get_1type_FUNC);
+	return rc;
+}
+#endif
+
 #ifndef NO__1webkit_1web_1view_1get_1uri
 JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1uri)
 	(JNIEnv *env, jclass that, jintLong arg0)
diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_stats.c b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_stats.c
index fc612e5722..5725527dc7 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_stats.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_stats.c
@@ -18,8 +18,8 @@
 
 #ifdef NATIVE_STATS
 
-int WebKitGTK_nativeFunctionCount = 109;
-int WebKitGTK_nativeFunctionCallCount[109];
+int WebKitGTK_nativeFunctionCount = 110;
+int WebKitGTK_nativeFunctionCallCount[110];
 char * WebKitGTK_nativeFunctionNames[] = {
 	"JSClassDefinition_1sizeof",
 	"_1JSClassCreate",
@@ -120,6 +120,7 @@ char * WebKitGTK_nativeFunctionNames[] = {
 	"_1webkit_1web_1view_1get_1progress",
 	"_1webkit_1web_1view_1get_1settings",
 	"_1webkit_1web_1view_1get_1title",
+	"_1webkit_1web_1view_1get_1type",
 	"_1webkit_1web_1view_1get_1uri",
 	"_1webkit_1web_1view_1get_1window_1features",
 	"_1webkit_1web_1view_1go_1back",
diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_stats.h b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_stats.h
index 4ec8c6d2c9..26832028c9 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_stats.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_stats.h
@@ -128,6 +128,7 @@ typedef enum {
 	_1webkit_1web_1view_1get_1progress_FUNC,
 	_1webkit_1web_1view_1get_1settings_FUNC,
 	_1webkit_1web_1view_1get_1title_FUNC,
+	_1webkit_1web_1view_1get_1type_FUNC,
 	_1webkit_1web_1view_1get_1uri_FUNC,
 	_1webkit_1web_1view_1get_1window_1features_FUNC,
 	_1webkit_1web_1view_1go_1back_FUNC,
diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java
index e9485dafe9..b7d300479a 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java
@@ -18,7 +18,7 @@ import java.util.*;
 import org.eclipse.swt.*;
 import org.eclipse.swt.graphics.*;
 import org.eclipse.swt.internal.*;
-import org.eclipse.swt.internal.gtk.OS;
+import org.eclipse.swt.internal.gtk.*;
 import org.eclipse.swt.internal.webkit.*;
 import org.eclipse.swt.layout.*;
 import org.eclipse.swt.widgets.*;
@@ -32,8 +32,9 @@ class WebKit extends WebBrowser {
 	byte[] htmlBytes;
 	BrowserFunction eventFunction;
 
-	static int /*long*/ ExternalClass, PostString;
-	static boolean IsWebKitGTK14orNewer, LibraryLoaded;
+	static int DisabledJSCount;
+	static int /*long*/ ExternalClass, PostString, WebViewType;
+	static boolean IsWebKit14orNewer, LibraryLoaded;
 	static Hashtable WindowMappings = new Hashtable ();
 
 	static final String ABOUT_BLANK = "about:blank"; //$NON-NLS-1$
@@ -100,6 +101,8 @@ class WebKit extends WebBrowser {
 		}
 
 		if (LibraryLoaded) {
+			WebViewType = WebKitGTK.webkit_web_view_get_type ();
+
 			Proc2 = new Callback (WebKit.class, "Proc", 2); //$NON-NLS-1$
 			if (Proc2.getAddress () == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS);
 			Proc3 = new Callback (WebKit.class, "Proc", 3); //$NON-NLS-1$
@@ -225,7 +228,7 @@ static boolean IsInstalled () {
 	int major = WebKitGTK.webkit_major_version ();
 	int minor = WebKitGTK.webkit_minor_version ();
 	int micro = WebKitGTK.webkit_micro_version ();
-	IsWebKitGTK14orNewer = major > 1 ||
+	IsWebKit14orNewer = major > 1 ||
 		(major == 1 && minor > 4) ||
 		(major == 1 && minor == 4 && micro >= 0);
 	return major > MIN_VERSION[0] ||
@@ -269,13 +272,56 @@ static int /*long*/ JSObjectHasPropertyProc (int /*long*/ ctx, int /*long*/ obje
 	return WebKitGTK.JSStringIsEqualToUTF8CString (propertyName, bytes);
 }
 
-static int /*long*/ JSDOMEventProc (int /*long*/ window, int /*long*/ event, int /*long*/ user_data) {
-	LONG webViewHandle = (LONG)WindowMappings.get (new LONG (window));
+static int /*long*/ JSDOMEventProc (int /*long*/ arg0, int /*long*/ event, int /*long*/ user_data) {
+	if (OS.GTK_IS_SCROLLED_WINDOW (arg0)) {
+		/*
+		 * Stop the propagation of events that are not consumed by WebKit, before
+		 * they reach the parent embedder.  These events have already been received.
+		 */
+		return user_data;
+	}
+
+	if (OS.G_TYPE_CHECK_INSTANCE_TYPE (arg0, WebViewType)) {
+		/*
+		* Only consider using GDK events to create SWT events to send if JS is disabled
+		* in one or more WebKit instances (indicates that this instance may not be
+		* receiving events from the DOM).  This check is done up-front for performance.
+		*/
+		if (DisabledJSCount > 0) {
+			final Browser browser = FindBrowser (arg0);
+			if (browser != null && !((WebKit)browser.webBrowser).jsEnabled) {
+				/* this instance does need to use the GDK event to create an SWT event to send */
+				OS.gtk_widget_event (browser.handle, event);
+				switch (OS.GDK_EVENT_TYPE (event)) {
+					case OS.GDK_KEY_PRESS: 
+						if (browser.isFocusControl ()) {
+							final GdkEventKey gdkEvent = new GdkEventKey ();
+							OS.memmove (gdkEvent, event, GdkEventKey.sizeof);
+							if ((gdkEvent.keyval == OS.GDK_ISO_Left_Tab || gdkEvent.keyval == OS.GDK_Tab) && (gdkEvent.state & (OS.GDK_CONTROL_MASK | OS.GDK_MOD1_MASK)) == 0) {
+								browser.getDisplay ().asyncExec (new Runnable () {
+									public void run () {
+										if (browser.isDisposed ()) return;
+										if (browser.getDisplay ().getFocusControl () == null) {
+											int traversal = (gdkEvent.state & OS.GDK_SHIFT_MASK) != 0 ? SWT.TRAVERSE_TAB_PREVIOUS : SWT.TRAVERSE_TAB_NEXT;
+											browser.traverse (traversal);
+										}
+									}
+								});
+							}
+						}
+						break;
+				}
+			}
+		}
+		return 0;
+	}
+
+	LONG webViewHandle = (LONG)WindowMappings.get (new LONG (arg0));
 	if (webViewHandle == null) return 0;
 	Browser browser = FindBrowser (webViewHandle.value);
 	if (browser == null) return 0;
 	WebKit webkit = (WebKit)browser.webBrowser;
-	return webkit.handleEvent (event, (int)user_data) ? 0 : 1;
+	return webkit.handleDOMEvent (event, (int)user_data) ? 0 : STOP_PROPOGATE;
 }
 
 static int /*long*/ Proc (int /*long*/ handle, int /*long*/ user_data) {
@@ -286,14 +332,6 @@ static int /*long*/ Proc (int /*long*/ handle, int /*long*/ user_data) {
 }
 
 static int /*long*/ Proc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ user_data) {
-	if (OS.GTK_IS_SCROLLED_WINDOW (handle)) {
-		/*
-		 * Stop the propagation of events that are not consumed by WebKit, before
-		 * they reach the parent embedder.  These events have already been received.
-		 */
-		return user_data;
-	}
-
 	int /*long*/ webView;
 	if (OS.G_TYPE_CHECK_INSTANCE_TYPE (handle, WebKitGTK.webkit_web_frame_get_type ())) {
 		webView = WebKitGTK.webkit_web_frame_get_web_view (handle);
@@ -451,14 +489,14 @@ public void create (Composite parent, int style) {
 		C.memmove (PostString, bytes, bytes.length);
 	}
 
-    scrolledWindow = OS.gtk_scrolled_window_new (0, 0);
-    OS.gtk_scrolled_window_set_policy (scrolledWindow, OS.GTK_POLICY_AUTOMATIC, OS.GTK_POLICY_AUTOMATIC);
-    webView = WebKitGTK.webkit_web_view_new ();
-    webViewData = C.malloc (C.PTR_SIZEOF);
-    C.memmove (webViewData, new int /*long*/[] {webView}, C.PTR_SIZEOF);
-    OS.gtk_container_add (scrolledWindow, webView);
-    OS.gtk_container_add (browser.handle, scrolledWindow);
-    OS.gtk_widget_show (scrolledWindow);
+	scrolledWindow = OS.gtk_scrolled_window_new (0, 0);
+	OS.gtk_scrolled_window_set_policy (scrolledWindow, OS.GTK_POLICY_AUTOMATIC, OS.GTK_POLICY_AUTOMATIC);
+	webView = WebKitGTK.webkit_web_view_new ();
+	webViewData = C.malloc (C.PTR_SIZEOF);
+	C.memmove (webViewData, new int /*long*/[] {webView}, C.PTR_SIZEOF);
+	OS.gtk_container_add (scrolledWindow, webView);
+	OS.gtk_container_add (browser.handle, scrolledWindow);
+	OS.gtk_widget_show (scrolledWindow);
 	OS.gtk_widget_show (webView);
 	OS.g_signal_connect (webView, WebKitGTK.close_web_view, Proc2.getAddress (), CLOSE_WEB_VIEW);
 	OS.g_signal_connect (webView, WebKitGTK.console_message, Proc5.getAddress (), CONSOLE_MESSAGE);
@@ -467,37 +505,43 @@ public void create (Composite parent, int style) {
 	OS.g_signal_connect (webView, WebKitGTK.hovering_over_link, Proc4.getAddress (), HOVERING_OVER_LINK);
 	OS.g_signal_connect (webView, WebKitGTK.mime_type_policy_decision_requested, Proc6.getAddress (), MIME_TYPE_POLICY_DECISION_REQUESTED);
 	OS.g_signal_connect (webView, WebKitGTK.navigation_policy_decision_requested, Proc6.getAddress (), NAVIGATION_POLICY_DECISION_REQUESTED);
-    OS.g_signal_connect (webView, WebKitGTK.notify_load_status, Proc3.getAddress (), NOTIFY_LOAD_STATUS);
-    OS.g_signal_connect (webView, WebKitGTK.notify_progress, Proc3.getAddress (), NOTIFY_PROGRESS);
-    OS.g_signal_connect (webView, WebKitGTK.notify_title, Proc3.getAddress (), NOTIFY_TITLE);
-    OS.g_signal_connect (webView, WebKitGTK.populate_popup, Proc3.getAddress (), POPULATE_POPUP);
-    OS.g_signal_connect (webView, WebKitGTK.resource_request_starting, Proc6.getAddress (), RESOURCE_REQUEST_STARTING);
-    OS.g_signal_connect (webView, WebKitGTK.status_bar_text_changed, Proc3.getAddress (), STATUS_BAR_TEXT_CHANGED);
-    OS.g_signal_connect (webView, WebKitGTK.web_view_ready, Proc2.getAddress (), WEB_VIEW_READY);
-    OS.g_signal_connect (webView, WebKitGTK.window_object_cleared, Proc5.getAddress (), WINDOW_OBJECT_CLEARED);
+	OS.g_signal_connect (webView, WebKitGTK.notify_load_status, Proc3.getAddress (), NOTIFY_LOAD_STATUS);
+	OS.g_signal_connect (webView, WebKitGTK.notify_progress, Proc3.getAddress (), NOTIFY_PROGRESS);
+	OS.g_signal_connect (webView, WebKitGTK.notify_title, Proc3.getAddress (), NOTIFY_TITLE);
+	OS.g_signal_connect (webView, WebKitGTK.populate_popup, Proc3.getAddress (), POPULATE_POPUP);
+	OS.g_signal_connect (webView, WebKitGTK.resource_request_starting, Proc6.getAddress (), RESOURCE_REQUEST_STARTING);
+	OS.g_signal_connect (webView, WebKitGTK.status_bar_text_changed, Proc3.getAddress (), STATUS_BAR_TEXT_CHANGED);
+	OS.g_signal_connect (webView, WebKitGTK.web_view_ready, Proc2.getAddress (), WEB_VIEW_READY);
+	OS.g_signal_connect (webView, WebKitGTK.window_object_cleared, Proc5.getAddress (), WINDOW_OBJECT_CLEARED);
 
 	/* Callback to get events before WebKit receives and consumes them */
-	OS.g_signal_connect (scrolledWindow, OS.event, Proc3.getAddress (), 0);
+	OS.g_signal_connect (webView, OS.button_press_event, JSDOMEventProc.getAddress (), 0);
+	OS.g_signal_connect (webView, OS.button_release_event, JSDOMEventProc.getAddress (), 0);
+	OS.g_signal_connect (webView, OS.key_press_event, JSDOMEventProc.getAddress (), 0);
+	OS.g_signal_connect (webView, OS.key_release_event, JSDOMEventProc.getAddress (), 0);
+	OS.g_signal_connect (webView, OS.scroll_event, JSDOMEventProc.getAddress (), 0);
+	OS.g_signal_connect (webView, OS.motion_notify_event, JSDOMEventProc.getAddress (), 0);
+
 	/*
 	* Callbacks to get the events not consumed by WebKit, and to block 
 	* them so that they don't get propagated to the parent handle twice.  
 	* This hook is set after WebKit and is therefore called after WebKit's 
 	* handler because GTK dispatches events in their order of registration.
 	*/
-	OS.g_signal_connect (scrolledWindow, OS.button_press_event, Proc3.getAddress (), STOP_PROPOGATE);
-	OS.g_signal_connect (scrolledWindow, OS.button_release_event, Proc3.getAddress (), STOP_PROPOGATE);
-	OS.g_signal_connect (scrolledWindow, OS.key_press_event, Proc3.getAddress (), STOP_PROPOGATE);
-	OS.g_signal_connect (scrolledWindow, OS.key_release_event, Proc3.getAddress (), STOP_PROPOGATE);
-	OS.g_signal_connect (scrolledWindow, OS.scroll_event, Proc3.getAddress (), STOP_PROPOGATE);
-	OS.g_signal_connect (scrolledWindow, OS.motion_notify_event, Proc3.getAddress (), STOP_PROPOGATE);
-
-    int /*long*/ settings = WebKitGTK.webkit_web_view_get_settings (webView);
-    OS.g_object_set (settings, WebKitGTK.javascript_can_open_windows_automatically, 1, 0);
-    OS.g_object_set (settings, WebKitGTK.enable_universal_access_from_file_uris, 1, 0);
-    byte[] bytes = Converter.wcsToMbcs (null, "UTF-8", true); // $NON-NLS-1$
-    OS.g_object_set (settings, WebKitGTK.default_encoding, bytes, 0);
-
-    Listener listener = new Listener () {
+	OS.g_signal_connect (scrolledWindow, OS.button_press_event, JSDOMEventProc.getAddress (), STOP_PROPOGATE);
+	OS.g_signal_connect (scrolledWindow, OS.button_release_event, JSDOMEventProc.getAddress (), STOP_PROPOGATE);
+	OS.g_signal_connect (scrolledWindow, OS.key_press_event, JSDOMEventProc.getAddress (), STOP_PROPOGATE);
+	OS.g_signal_connect (scrolledWindow, OS.key_release_event, JSDOMEventProc.getAddress (), STOP_PROPOGATE);
+	OS.g_signal_connect (scrolledWindow, OS.scroll_event, JSDOMEventProc.getAddress (), STOP_PROPOGATE);
+	OS.g_signal_connect (scrolledWindow, OS.motion_notify_event, JSDOMEventProc.getAddress (), STOP_PROPOGATE);
+
+	int /*long*/ settings = WebKitGTK.webkit_web_view_get_settings (webView);
+	OS.g_object_set (settings, WebKitGTK.javascript_can_open_windows_automatically, 1, 0);
+	OS.g_object_set (settings, WebKitGTK.enable_universal_access_from_file_uris, 1, 0);
+	byte[] bytes = Converter.wcsToMbcs (null, "UTF-8", true); // $NON-NLS-1$
+	OS.g_object_set (settings, WebKitGTK.default_encoding, bytes, 0);
+
+	Listener listener = new Listener () {
 		public void handleEvent (Event event) {
 			switch (event.type) {
 				case SWT.Dispose: {
@@ -585,7 +629,13 @@ public void create (Composite parent, int style) {
 }
 
 void addEventHandlers (int /*long*/ web_view, boolean top) {
-	if (top && IsWebKitGTK14orNewer) {
+	/*
+	* If JS is disabled (causes DOM events to not be delivered) then do not add event
+	* listeners here, DOM events will be inferred from received GDK events instead. 
+	*/
+	if (!jsEnabled) return;
+
+	if (top && IsWebKit14orNewer) {
 		int /*long*/ domDocument = WebKitGTK.webkit_web_view_get_dom_document (web_view);
 		if (domDocument != 0) {
 			WindowMappings.put (new LONG (domDocument), new LONG (web_view));
@@ -783,7 +833,7 @@ public String getUrl () {
 	return url;
 }
 
-boolean handleEvent (int /*long*/ event, int type) {
+boolean handleDOMEvent (int /*long*/ event, int type) {
 	/*
 	* This method handles JS events that are received through the DOM
 	* listener API that was introduced in WebKitGTK 1.4.
@@ -1128,7 +1178,7 @@ boolean handleMouseEvent (String type, int screenX, int screenY, int detail, int
 		* display, see https://bugs.webkit.org/show_bug.cgi?id=32840.  The
 		* workaround is to veto all drag attempts if using WebKitGTK 1.2.x.
 		*/
-		if (!IsWebKitGTK14orNewer) {
+		if (!IsWebKit14orNewer) {
 			browser.notifyListeners (mouseEvent.type, mouseEvent);
 			return false;
 		}
@@ -1620,8 +1670,9 @@ int /*long*/ webkit_navigation_policy_decision_requested (int /*long*/ web_view,
 		}
 	}
 	if (newEvent.doit && !browser.isDisposed ()) {
-		if (jsEnabledChanged) {
-			jsEnabledChanged = false;
+		if (jsEnabled != jsEnabledOnNextPage) {
+			jsEnabled = jsEnabledOnNextPage;
+			DisabledJSCount += !jsEnabled ? 1 : -1;
 			int /*long*/ settings = WebKitGTK.webkit_web_view_get_settings (webView);
 			OS.g_object_set (settings, WebKitGTK.enable_scripts, jsEnabled ? 1 : 0, 0);
 		}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/internal/webkit/WebKitGTK.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/internal/webkit/WebKitGTK.java
index f6e83cb6f1..52ba6975f6 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/internal/webkit/WebKitGTK.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/internal/webkit/WebKitGTK.java
@@ -1128,6 +1128,17 @@ public static final int /*long*/ webkit_web_view_get_title (int /*long*/ web_vie
 }
 
 /** @method flags=dynamic */
+public static final native int /*long*/ _webkit_web_view_get_type ();
+public static final int /*long*/ webkit_web_view_get_type () {
+	lock.lock();
+	try {
+		return _webkit_web_view_get_type ();
+	} finally {
+		lock.unlock();
+	}
+}
+
+/** @method flags=dynamic */
 public static final native int /*long*/ _webkit_web_view_get_uri (int /*long*/ web_view);
 public static final int /*long*/ webkit_web_view_get_uri (int /*long*/ web_view) {
 	lock.lock();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebPolicyDelegate.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebPolicyDelegate.java
index 0469ec4bfc..5a3579aef3 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebPolicyDelegate.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebPolicyDelegate.java
@@ -112,8 +112,8 @@ int decidePolicyForNavigationAction (int /*long*/ webView, int /*long*/ actionIn
 		}
 	}
 	if (newEvent.doit) {
-		if (webKit.jsEnabledChanged) {
-			webKit.jsEnabledChanged = false;
+		if (webkit.jsEnabled != webkit.jsEnabledOnNextPage) {
+			webkit.jsEnabled = webkit.jsEnabledOnNextPage;
 			IWebView view = new IWebView (webView);
 			result[0] = 0;
 			hr = view.preferences (result);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Widget.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Widget.java
index 9d223ba73f..1357e37152 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Widget.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Widget.java
@@ -1578,8 +1578,8 @@ boolean setKeyState (Event event, GdkEventKey keyEvent) {
 		case OS.GDK_ISO_Left_Tab: 	event.character = SWT.TAB; break;
 		default: {
 			if (event.keyCode == 0) {
-				int [] keyval = new int [1], effective_group= new int [1], level = new int [1], consumed_modifiers = new int [1];
-				if (OS.gdk_keymap_translate_keyboard_state(OS.gdk_keymap_get_default (), keyEvent.hardware_keycode, 0, keyEvent.group, keyval, effective_group, level, consumed_modifiers)) {
+				int [] keyval = new int [1], effective_group = new int [1], level = new int [1], consumed_modifiers = new int [1];
+				if (OS.gdk_keymap_translate_keyboard_state (OS.gdk_keymap_get_default (), keyEvent.hardware_keycode, 0, keyEvent.group, keyval, effective_group, level, consumed_modifiers)) {
 					event.keyCode = OS.gdk_keyval_to_unicode (keyval [0]);
 				}
 			}
@@ -1594,7 +1594,7 @@ boolean setKeyState (Event event, GdkEventKey keyEvent) {
 			}
 		}
 	}
-	setLocationState(event, keyEvent);
+	setLocationState (event, keyEvent);
 	if (event.keyCode == 0 && event.character == 0) {
 		if (!isNull) return false;
 	}