Bug 511797: [Webkit2] locationChange.changed() not working on webkit2

Patch to fix LocationListener.changed() not working on webkit2.

With this, the ChangeListener() tests work introduced in the bug work on
webkit2.

Change-Id: Ib81c0336280094ed873d460cacce485b00826008
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=511797
Signed-off-by: Leo Ufimtsev <lufimtse@redhat.com>

1 files changed, 12 insertions, 8 deletions

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 25625a0384..f1bbc36e64 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
@@ -1599,14 +1599,18 @@ long /*int*/ handleLoadCommitted (long /*int*/ uri, boolean top) {
 		}
 	}
 
-	/*
-	* Each invocation of setText() causes webkit_notify_load_status to be invoked
-	* twice, once for the initial navigate to about:blank, and once for the auto-navigate
-	* to about:blank that WebKit does when webkit_web_view_load_string is invoked.  If
-	* this is the first webkit_notify_load_status callback received for a setText()
-	* invocation then do not send any events or re-install registered BrowserFunctions.
-	*/
-	if (top && url.startsWith(ABOUT_BLANK) && htmlBytes != null) return 0;
+	// Bug 511797 : On webkit2, this code is only reached once per page load.
+	if (!WEBKIT2) {
+		/*
+		* Webkit1:
+		* Each invocation of setText() causes webkit_notify_load_status to be invoked
+		* twice, once for the initial navigate to about:blank, and once for the auto-navigate
+		* to about:blank that WebKit does when webkit_web_view_load_string is invoked.  If
+		* this is the first webkit_notify_load_status callback received for a setText()
+		* invocation then do not send any events or re-install registered BrowserFunctions.
+		*/
+		if (top && url.startsWith(ABOUT_BLANK) && htmlBytes != null) return 0;
+	}
 
 	LocationEvent event = new LocationEvent (browser);
 	event.display = browser.getDisplay ();