Revert "Bug 430538: [GTK3][webkit] Support Custom JavaScript execution in WebKit2 mode of SWT Browser"

This reverts commit 7003ce9e76832ab4cf8e13c1633c97edca922ae7 due to native build failures caused by building on machines with older GTK libraries.

Change-Id: Iff3cc1acc8d92e57c5cafdf62df879cec21059d3

9 files changed, 15 insertions, 210 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak
index 40ee285d22..9d3aa874e7 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak
@@ -100,9 +100,7 @@ MOZILLAEXCLUDES = -DNO__1XPCOMGlueShutdown \
 	-DNO_nsDynamicFunctionLoad
 XULRUNNEREXCLUDES = -DNO__1NS_1InitXPCOM2
 
-
-WEBKITLIBS = `pkg-config --libs-only-l gio-2.0`  # Avoid adding 'webkit2gtk-4.0', as some systems might not have it.
-WEBKITCFLAGS = `pkg-config --cflags gio-2.0`     #     webkit functions should be called dynamically. See Bug 430538
+WEBKITCFLAGS = `pkg-config --cflags glib-2.0`
 
 SWT_OBJECTS = swt.o c.o c_stats.o callback.o
 CDE_OBJECTS = swt.o cde.o cde_structs.o cde_stats.o
@@ -114,7 +112,7 @@ GNOME_OBJECTS = swt.o gnome.o gnome_structs.o gnome_stats.o
 MOZILLA_OBJECTS = swt.o xpcom.o xpcom_custom.o xpcom_structs.o xpcom_stats.o
 XULRUNNER_OBJECTS = swt.o xpcomxul.o xpcomxul_custom.o xpcomxul_structs.o xpcomxul_stats.o
 XPCOMINIT_OBJECTS = swt.o xpcominit.o xpcominit_structs.o xpcominit_stats.o
-WEBKIT_OBJECTS = swt.o webkitgtk.o webkitgtk_structs.o webkitgtk_stats.o webkitgtk_custom.o
+WEBKIT_OBJECTS = swt.o webkit.o webkit_structs.o webkit_stats.o
 GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o
 
 CFLAGS = -O -Wall \
@@ -296,19 +294,16 @@ xpcominit_stats.o: xpcominit_stats.cpp
 make_webkit: $(WEBKIT_LIB)
 
 $(WEBKIT_LIB): $(WEBKIT_OBJECTS)
-	$(CC) $(LFLAGS) -o $(WEBKIT_LIB) $(WEBKIT_OBJECTS) $(WEBKITLIBS)
-
-webkitgtk.o: webkitgtk.c webkitgtk_custom.h
-	$(CC) $(CFLAGS) $(WEBKITCFLAGS) -c webkitgtk.c
+	$(CC) $(LFLAGS) -o $(WEBKIT_LIB) $(WEBKIT_OBJECTS)
 
-webkitgtk_structs.o: webkitgtk_structs.c
-	$(CC) $(CFLAGS) $(WEBKITCFLAGS) -c webkitgtk_structs.c
+webkit.o: webkitgtk.c 
+	$(CC) $(CFLAGS) $(WEBKITCFLAGS) -c webkitgtk.c -o webkit.o
 
-webkitgtk_stats.o: webkitgtk_stats.c webkitgtk_stats.h
-	$(CC) $(CFLAGS) $(WEBKITCFLAGS) -c webkitgtk_stats.c
-
-webkitgtk_custom.o: webkitgtk_custom.c
-	$(CC) $(CFLAGS) $(WEBKITCFLAGS) -c webkitgtk_custom.c
+webkit_structs.o: webkitgtk_structs.c 
+	$(CC) $(CFLAGS) $(WEBKITCFLAGS) -c webkitgtk_structs.c -o webkit_structs.o
+	
+webkit_stats.o: webkitgtk_stats.c webkitgtk_stats.h
+	$(CC) $(CFLAGS) $(WEBKITCFLAGS) -c webkitgtk_stats.c -o webkit_stats.o
 
 #
 # GLX lib
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 3947b5bfe3..87ead7f286 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
@@ -1041,22 +1041,6 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1soup_1uri_1to_1string)
 }
 #endif
 
-#ifndef NO__1swt_1webkit_1web_1view_1run_1javascript
-JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1swt_1webkit_1web_1view_1run_1javascript)
-	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
-{
-	jbyte *lparg1=NULL;
-	jlong rc = 0;
-	WebKitGTK_NATIVE_ENTER(env, that, _1swt_1webkit_1web_1view_1run_1javascript_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	rc = (jlong)swt_webkit_web_view_run_javascript(arg0, lparg1);
-fail:
-	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-	WebKitGTK_NATIVE_EXIT(env, that, _1swt_1webkit_1web_1view_1run_1javascript_FUNC);
-	return rc;
-}
-#endif
-
 #ifndef NO__1webkit_1authentication_1request_1authenticate
 JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1authentication_1request_1authenticate)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.h b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.h
index 00219cf811..8621fef9c3 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.h
@@ -12,9 +12,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-
-/* Manually written code */
-
+  
 #ifndef INC_webkitgtk_H
 #define INC_webkitgtk_H
 
@@ -23,9 +21,6 @@
 #include <stdlib.h>
 #include <glib-object.h>
 
-// For JNI bindings in webkitgtk.c to properly link to custom functions:
-#include "webkitgtk_custom.h"
-
 #define WebKitGTK_LOAD_FUNCTION(var, name) \
 	static int initialized = 0; \
 	static void *var = NULL; \
diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_custom.c b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_custom.c
deleted file mode 100644
index 3b2f887377..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_custom.c
+++ /dev/null
@@ -1,133 +0,0 @@
-/*******************************************************************************
-* Copyright (c) 2016 Red Hat, Inc. All rights reserved.
-* The contents of this file are made available under the terms
-* of the GNU Lesser General Public License (LGPL) Version 2.1 that
-* accompanies this distribution (lgpl-v21.txt).  The LGPL is also
-* available at http://www.gnu.org/licenses/lgpl.html.  If the version
-* of the LGPL at http://www.gnu.org is different to the version of
-* the LGPL accompanying this distribution and there is any conflict
-* between the two license versions, the terms of the LGPL accompanying
-* this distribution shall govern.
-*
-* Contributors:
-*     Red Hat, Inc
-*******************************************************************************/
-
-/* Manually written code */
-
-#include "webkitgtk_custom.h"
-#include "webkitgtk.h"  // For WebKitGTK_LOAD_FUNCTION macro
-#include "swt.h"		// For types like jintLong etc..
-
-#include <gio/gio.h>	// For things like GAsyncResult
-
-
-// Note about webkit includes:
-// Do not include things like '<webkit2/webkit2.h>' '<JavaScriptCore/JavaScript.h>' directly.
-// All webkit functions must be loaded dynamically.
-// If you compile on a newer Linux that contains Webkit2, trying to run the compiled binary on older
-// OS's without webkit2 will lead to a crash even when they are running in 'Webkit1' mode.
-// See Bug 430538.
-
-
-/*
- Calling JS script and getting return value example copied and adapted from:
- https://webkitgtk.org/reference/webkit2gtk/stable/WebKitWebView.html#webkit-web-view-run-javascript-finish
-*/
-static void
-web_view_javascript_finished_callback (GObject      *object,
-                              GAsyncResult *result,
-                              gpointer      user_data)
-{
-
-	//// TODO handling of return value to be implemented in Stage 2.
-	//// All webkit functions will need to be called dynamically.
-//    WebKitJavascriptResult *js_result;
-//    JSValueRef              value;
-//    JSGlobalContextRef      context;
-//    GError                 *error = NULL;
-//
-//
-//    js_result = webkit_web_view_run_javascript_finish (WEBKIT_WEB_VIEW (object), result, &error);
-//    if (!js_result) {
-//    	// Recoverable runtime error:
-//        g_warning ("webkitgtk_custom.c: Error running javascript(1): %s", error->message);
-//        g_error_free (error);
-//    } else {
-//		context = webkit_javascript_result_get_global_context (js_result);
-//		value = webkit_javascript_result_get_value (js_result);
-//
-//
-////		// TODO WEBKIT2 - handle various return value(s). Starter code below.
-//		//		Idea: create struct with pointer to return value and lock;
-//		//		then pass it along via user_data. NOTE *malloc it*
-//
-//	    // Supress compiler warnings till return types implemented.
-//	    (void) value;
-//	    (void) context;
-//
-////		if (JSValueIsString (context, value)) {
-////			JSStringRef js_str_value;
-////			gchar      *str_value;
-////			gsize       str_length;
-////
-////			js_str_value = JSValueToStringCopy (context, value, NULL);
-////			str_length = JSStringGetMaximumUTF8CStringSize (js_str_value);
-////			str_value = (gchar *)g_malloc (str_length);
-////			JSStringGetUTF8CString (js_str_value, str_value, str_length);
-////			JSStringRelease (js_str_value);
-////			g_print ("Script result: %s\n", str_value);
-////			g_free (str_value);
-////
-////		// else if JSValueIsBoolean
-////		// else if JSValueIsNumber
-////		// else if JSValueIsObject
-////		// else if JSValueIsNull
-////		// else if JSValueIsArray
-////		// else if JSValueIsUndefined (?)
-////		// else if JSValueIsDate (?)
-////		} else {
-////			g_warning ("webkitgtk_custom.c: Error running javascript(2): unexpected return value");
-////		}
-//
-//		webkit_javascript_result_unref (js_result);
-//    }
-//
-//    // Note about exit points: this function must unlock the spinlock prior to returning.
-//    // As such there should not be a 'return' in this function above the unlocking code
-    gboolean *JsCallFinished = (gboolean* ) user_data;
-    *JsCallFinished = TRUE;
-}
-
-
-
-/*
- * Type notes:
- * [Java]     ->  [native]
- * byte []    -> signed char *str
- * long /int/ -> long
-*/
-/**
- * Convert the async function webkit_web_view_run_javascript(..) into a synchronous one
- * by spinning until the callback is completed.
- */
-long swt_webkit_web_view_run_javascript (long webkit_handle, signed char *script) {
-
-	// TODO - WEBKIT2 port this will eventually be a struct that will hold the return value.
-	gboolean * JsCallFinished = g_new(gboolean, 1); //allocate 1 unit of gboolean (not assigning '1' to it).
-	*JsCallFinished = FALSE;
-
-	// Macro usage copied and adjusted from webkitgtk.c's 'NO__1webkit_1web_1view_1run_1javascript' wrapper.
-	WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_run_javascript)
-	if (fp) {
-		((void (CALLING_CONVENTION*)(jintLong, jbyte *, jintLong, jintLong, jintLong))fp)((jintLong) webkit_handle, script, (jintLong) 0, (jintLong) web_view_javascript_finished_callback, (jintLong) JsCallFinished);
-	}
-
-	// Spin till callback completes. Note this spin is needed for 'callback' event to be called, otherwise we have a hang.
-	while (*JsCallFinished == FALSE) {
-		g_main_context_iteration(0, FALSE);
-	}
-	g_free(JsCallFinished);
-
-	return 1;
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_custom.h b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_custom.h
deleted file mode 100644
index c220705b07..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_custom.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
-* Copyright (c) 2016 Red Hat, Inc. All rights reserved.
-* The contents of this file are made available under the terms
-* of the GNU Lesser General Public License (LGPL) Version 2.1 that
-* accompanies this distribution (lgpl-v21.txt).  The LGPL is also
-* available at http://www.gnu.org/licenses/lgpl.html.  If the version
-* of the LGPL at http://www.gnu.org is different to the version of
-* the LGPL accompanying this distribution and there is any conflict
-* between the two license versions, the terms of the LGPL accompanying
-* this distribution shall govern.
-*
-* Contributors:
-*     Red Hat, Inc
-*******************************************************************************/
-
-#ifndef INC_webkitgtk_custom_H
-#define INC_webkitgtk_custom_H
-
-/* Manually written code */
-
-long swt_webkit_web_view_run_javascript (long webkit_handle, signed char *script);
-
-#endif /*INC_webkit_custom_H*/
-
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 0a8a44ae42..6d0961a560 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
@@ -73,7 +73,6 @@ char * WebKitGTK_nativeFunctionNames[] = {
 	"_1soup_1uri_1free",
 	"_1soup_1uri_1new",
 	"_1soup_1uri_1to_1string",
-	"_1swt_1webkit_1web_1view_1run_1javascript",
 	"_1webkit_1authentication_1request_1authenticate",
 	"_1webkit_1authentication_1request_1cancel",
 	"_1webkit_1authentication_1request_1is_1retry",
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 20502b0ba8..a882b17f55 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
@@ -83,7 +83,6 @@ typedef enum {
 	_1soup_1uri_1free_FUNC,
 	_1soup_1uri_1new_FUNC,
 	_1soup_1uri_1to_1string_FUNC,
-	_1swt_1webkit_1web_1view_1run_1javascript_FUNC,
 	_1webkit_1authentication_1request_1authenticate_FUNC,
 	_1webkit_1authentication_1request_1cancel_FUNC,
 	_1webkit_1authentication_1request_1is_1retry_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 a850e8da21..a4abe6e53f 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
@@ -905,11 +905,12 @@ boolean close (boolean showPrompters) {
 public boolean execute (String script) {
 	byte[] scriptBytes = (script + '\0').getBytes (StandardCharsets.UTF_8); //$NON-NLS-1$
 
+
 	long /*int*/ result = 0;
 	if (WEBKIT2){
-		// Currently always returns 1 upon completion.
-		// TODO WEBKIT2 - modify webkitgtk_custom to return 0 if there is an error.
-		result = (int) WebKitGTK.swt_webkit_web_view_run_javascript(webView, scriptBytes);
+		WebKitGTK.webkit_web_view_run_javascript (webView, scriptBytes, 0, 0, 0);
+		// TODO - this call is asynchronous, so no return vaulue. As result this call executes but
+		// returns false. Handling of return value to be implemented...
 	} else {
 		long /*int*/ jsScriptString = WebKitGTK.JSStringCreateWithUTF8CString (scriptBytes);
 
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 4e52d2db86..98fe4e30d0 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
@@ -1675,15 +1675,4 @@ public static final long /*int*/ SoupMessage_request_headers (long /*int*/ messa
 	}
 }
 
-/* This custom function must only be called on Webkit2, use if (WEBKIT2) boolean. */
-public static final native long _swt_webkit_web_view_run_javascript (long /*int*/ webkit_handle, byte[] script);
-public static final long swt_webkit_web_view_run_javascript (long /*int*/ webkit_handle, byte[] script) {
-	lock.lock();
-	try {
-		return _swt_webkit_web_view_run_javascript (webkit_handle, script);
-	} finally {
-		lock.unlock();
-	}
-}
-
 }