diff --git eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/common_j2se/org/eclipse/swt/internal/Library.java eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/common_j2se/org/eclipse/swt/internal/Library.java

index 780a82c..c3bedd0 100644

--- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/common_j2se/org/eclipse/swt/internal/Library.java	

+++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/common_j2se/org/eclipse/swt/internal/Library.java	

@@ -10,9 +10,15 @@

  *******************************************************************************/

 package org.eclipse.swt.internal;

-import java.io.*;

-import java.net.*;

-import java.util.jar.*;

+import java.io.File;

+import java.io.FileOutputStream;

+import java.io.IOException;

+import java.io.InputStream;

+import java.lang.reflect.Method;

+import java.net.JarURLConnection;

+import java.net.URL;

+import java.net.URLConnection;

+import java.util.jar.Attributes;

 public class Library {

@@ -263,19 +269,7 @@ public static void loadLibrary (String name, boolean mapName) {

 	/* Compute the library name and mapped name */

 	String libName1, libName2, mappedName1, mappedName2;

 	if (mapName) {

-		String version = System.getProperty ("swt.version"); //$NON-NLS-1$

-		if (version == null) {

-			version = "" + MAJOR_VERSION; //$NON-NLS-1$

-			/* Force 3 digits in minor version number */

-			if (MINOR_VERSION < 10) {

-				version += "00"; //$NON-NLS-1$

-			} else {

-				if (MINOR_VERSION < 100) version += "0"; //$NON-NLS-1$

-			}

-			version += MINOR_VERSION;		

-			/* No "r" until first revision */

-			if (REVISION > 0) version += "r" + REVISION; //$NON-NLS-1$

-		}

+		String version = getVersionString();

 		libName1 = name + "-" + Platform.PLATFORM + "-" + version;  //$NON-NLS-1$ //$NON-NLS-2$

 		libName2 = name + "-" + Platform.PLATFORM;  //$NON-NLS-1$

 		mappedName1 = mapLibraryName (libName1);

@@ -337,4 +331,60 @@ static String mapLibraryName (String libName) {

 	return libName;

 }

+private static String getVersionString(){

+	String version = System.getProperty ("swt.version"); //$NON-NLS-1$

+	if (version == null) {

+		version = "" + MAJOR_VERSION; //$NON-NLS-1$

+		/* Force 3 digits in minor version number */

+		if (MINOR_VERSION < 10) {

+			version += "00"; //$NON-NLS-1$

+		} else {

+			if (MINOR_VERSION < 100) version += "0"; //$NON-NLS-1$

+		}

+		version += MINOR_VERSION;

+		/* No "r" until first revision */

+		if (REVISION > 0) version += "r" + REVISION; //$NON-NLS-1$

+	}

+	return version;

+}

+

+public static File findResource(String resourceName, boolean mapName){

+	if (mapName){

+		resourceName = resourceName + "-"+ getVersionString();

+		resourceName = mapLibraryName(resourceName);

+	}

+	// Look for the resource in the swt library path

+	String classpath = System.getProperty("java.library.path");

+	if (classpath != null){

+		File file = new File(classpath + SEPARATOR + resourceName);

+		if (file.exists()){

+			return file;

+		}

+	}

+

+	// If this is an OSGI bundle look for the resource using getResource

+	URL url = Library.class.getClassLoader().getResource(resourceName);

+	URLConnection connection;

+	try {

+		connection = url.openConnection();

+		Method getFileURLMethod = connection.getClass().getMethod("getFileURL");

+

+	if (getFileURLMethod != null){

+		URL result = (URL) getFileURLMethod.invoke(connection);

+		return new File(result.toURI());

+	}

+	} catch (Exception e) {

+		// If any exceptions are thrown the resource cannot be located this way.

+	}

+

+	// Look for the resource in the user's home directory

+	String homeDir = System.getProperty ("user.home"); //$NON-NLS-1$

+	File file = new File (homeDir + SWT_LIB_DIR, resourceName);

+	if (file.exists()){

+		return file;

+	}

+

+	return null;

+}

+

 }

diff --git eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak

index 6bce587..fea2a5b 100644

--- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak	

+++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak	

@@ -48,6 +48,7 @@ XULRUNNER_LIB = lib$(XULRUNNER_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so

 XULRUNNER24_LIB = lib$(XULRUNNER24_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so

 XPCOMINIT_LIB = lib$(XPCOMINIT_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so

 WEBKIT_LIB = lib$(WEBKIT_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so

+WEBKIT_EXTENSION = lib$(WEBKIT_PREFIX)-extension-$(SWT_VERSION).so

 GLX_LIB = lib$(GLX_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so

 CAIROCFLAGS = `pkg-config --cflags cairo`

@@ -298,7 +299,7 @@ xpcominit_stats.o: xpcominit_stats.cpp

 #

 # WebKit lib

 #

-make_webkit: $(WEBKIT_LIB)

+make_webkit: $(WEBKIT_LIB) $(WEBKIT_EXTENSION)

 $(WEBKIT_LIB): $(WEBKIT_OBJECTS)

 	$(CC) $(LFLAGS) -o $(WEBKIT_LIB) $(WEBKIT_OBJECTS)

@@ -312,6 +313,13 @@ webkit_structs.o: webkitgtk_structs.c

 webkit_stats.o: webkitgtk_stats.c webkitgtk_stats.h

 	$(CC) $(CFLAGS) $(WEBKITCFLAGS) -c webkitgtk_stats.c -o webkit_stats.o

+webkit_extension.o: webkit_extension.c webkit_extension.h

+	$(CC) $(CFLAGS) $(WEBKITCFLAGS) -c webkit_extension.c -o webkit_extension.o `pkg-config --cflags --libs webkit2gtk-4.0`

+

+$(WEBKIT_EXTENSION): webkit_extension.o

+	$(CC) -g -shared -Wl,-no-undefined,-soname,$(WEBKIT_EXTENSION) \

+        `pkg-config --cflags --libs webkit2gtk-4.0` -o $(WEBKIT_EXTENSION) webkit_extension.o -lc

+

 #

 # GLX lib

 #

diff --git eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkit_extension.c eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkit_extension.c

new file mode 100644

index 0000000..b6288de

--- /dev/null

+++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkit_extension.c	

@@ -0,0 +1,394 @@

+/*******************************************************************************

+ * Copyright (c) 2014 Red Hat and others. 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 - initial API and implementation

+ *******************************************************************************/

+

+#include "webkit_extension.h"

+

+/**

+ * This function will get called when JavaScript calls external.callJava

+ */

+static JSValueRef

+webkit_extension_external_object_callJava(JSContextRef context,

+    JSObjectRef object,

+    JSObjectRef thisObject,

+    size_t argumentCount,

+    const JSValueRef arguments[],

+    JSValueRef* exception)

+{

+   JSStringRef propertyName =JSStringCreateWithUTF8CString ("pageId");

+   JSValueRef value = JSObjectGetProperty (context, thisObject, propertyName, NULL);

+   JSStringRelease (propertyName);

+

+   // Forward the java call to Java

+   g_assert (argumentCount == 3);

+   GVariant *result = g_dbus_proxy_call_sync (main_process_proxy,

+                      "webkit_extension_external_object_callJava",

+                      g_variant_new ("(t@d@s@r)", (guint64)JSValueToNumber (context, value, NULL),

+                          webkit_extension_convert_js_to_gvariant(context, arguments[0]),

+                          webkit_extension_convert_js_to_gvariant(context, arguments[1]),

+                          webkit_extension_convert_js_to_gvariant(context, arguments[2])),

+                      G_DBUS_CALL_FLAGS_NONE,

+                      -1,

+                      NULL,

+                      NULL);

+

+   return webkit_extension_convert_gvariant_to_js(context, result);

+}

+

+static JSValueRef webkit_extension_convert_gvariant_to_js (JSContextRef context, GVariant * value){

+

+  if (g_variant_is_of_type(value, G_VARIANT_TYPE_BYTE) && g_variant_get_byte(value) == 0x00){

+      return JSValueMakeUndefined (context);

+  }

+

+  if (g_variant_is_of_type(value, G_VARIANT_TYPE_BOOLEAN)){

+      return JSValueMakeBoolean (context, g_variant_get_boolean(value));

+  }

+

+  if (g_variant_is_of_type(value, G_VARIANT_TYPE_DOUBLE)){

+      return JSValueMakeNumber (context, g_variant_get_double(value));

+  }

+

+  if (g_variant_is_of_type(value, G_VARIANT_TYPE_STRING)){

+      JSStringRef stringRef = JSStringCreateWithUTF8CString (g_variant_get_string(value, NULL));

+      JSValueRef result = JSValueMakeString (context, stringRef);

+      JSStringRelease (stringRef);

+      return result;

+  }

+

+  if (g_variant_is_of_type(value, G_VARIANT_TYPE_UINT64)){

+      return JSValueMakeNumber (context, g_variant_get_uint64(value));

+  }

+

+  if (g_variant_is_of_type(value, G_VARIANT_TYPE_TUPLE)){

+      gsize length = (int)g_variant_n_children (value);

+      JSValueRef *children = g_new (JSValueRef, length);

+

+      int i = 0;

+      for (i = 0; i < length; i++) {

+          children[i] = webkit_extension_convert_gvariant_to_js (context, g_variant_get_child_value(value, i));

+      }

+      JSValueRef result = JSObjectMakeArray (context, length, children, NULL);

+      g_free (children);

+      return result;

+  }

+

+  g_error("Unhandled type %s \n", g_variant_get_type_string (value));

+

+  return NULL;

+}

+

+static GVariant * webkit_extension_convert_js_to_gvariant (JSContextRef context, JSValueRef value){

+  JSType type = JSValueGetType (context, value);

+

+  if (type == kJSTypeBoolean){

+      gboolean result = JSValueToNumber (context, value, NULL) != 0;

+      return g_variant_new_boolean(result);

+  }

+

+  if (type == kJSTypeNumber){

+      double result = JSValueToNumber (context, value, NULL);

+      return g_variant_new_double (result);

+  }

+

+  if (type == kJSTypeString){

+      JSStringRef stringRef = JSValueToStringCopy(context, value, NULL);

+      size_t length = JSStringGetMaximumUTF8CStringSize (stringRef);

+      char* string = (char*)malloc(length);

+      JSStringGetUTF8CString(stringRef, string, length);

+      GVariant *variant = g_variant_new_string(string);

+      free(string);

+      return variant;

+  }

+

+  if (type == kJSTypeNull || type == kJSTypeUndefined){

+      return NULL;

+  }

+

+  if (type == kJSTypeObject){

+

+      JSStringRef propertyName =JSStringCreateWithUTF8CString ("length");

+      JSObjectRef object =  JSValueToObject(context, value, NULL);

+      JSValueRef valuePtr = JSObjectGetProperty (context, object, propertyName, NULL);

+      JSStringRelease (propertyName);

+

+      if (JSValueGetType (context, valuePtr) == kJSTypeNumber) {

+          int length = (int)JSValueToNumber (context, valuePtr, NULL);

+          GVariant **children = g_new (GVariant *, length);

+

+          int i = 0;

+          for (i = 0; i < length; i++) {

+              const JSValueRef child = JSObjectGetPropertyAtIndex (context, object, i, NULL);

+              children[i] = webkit_extension_convert_js_to_gvariant(context, child);

+          }

+          GVariant* variant = g_variant_new_tuple (children, length);

+          g_free (children);

+          return variant;

+      }

+  }

+

+  // Get type value string

+  JSStringRef valueIString = JSValueToStringCopy(context, value, NULL);

+  size_t valueUTF8Size = JSStringGetMaximumUTF8CStringSize(valueIString);

+  char* valueUTF8 = (char*)malloc(valueUTF8Size);

+  JSStringGetUTF8CString(valueIString, valueUTF8, valueUTF8Size);

+

+  g_error("Unhandled type %d value: %s \n", type, valueUTF8);

+  free(valueUTF8);

+  JSStringRelease(valueIString);

+

+  return NULL;

+}

+

+/**

+ * Returns the main frame of the WebPage with the given id

+ */

+static WebKitFrame *webkit_extension_get_main_frame (const guint64 id){

+  WebKitWebPage *web_page = webkit_web_extension_get_page (this_extension, id);

+  return webkit_web_page_get_main_frame (web_page);

+}

+

+/**

+ * The 'external' object's hasProperty function. This function will confirm

+ * that 'external.callJava' exist

+ */

+static bool external_object_hasProperty(JSContextRef context, JSObjectRef object, JSStringRef propertyName){

+  return JSStringIsEqualToUTF8CString(propertyName, "callJava");

+}

+

+/**

+ * For the 'callJava' property of the 'external' object create a JavaScript

+ * function which will call back webkit_extension_external_object_callJava

+ */

+static JSValueRef external_object_getProperty(JSContextRef context, JSObjectRef object, JSStringRef propertyName, JSValueRef* exception){

+

+  if (JSStringIsEqualToUTF8CString(propertyName, "callJava")) {

+      return JSObjectMakeFunctionWithCallback (context, propertyName, webkit_extension_external_object_callJava);

+  }

+

+  return NULL;

+}

+

+JSClassDefinition external_object_definition = {

+    0,

+    kJSClassAttributeNone,

+

+    "external",

+    NULL,

+

+    NULL,

+    NULL,

+

+    NULL,

+    NULL,

+    external_object_hasProperty,

+    external_object_getProperty,

+    NULL,

+    NULL,

+    NULL,

+    NULL,

+    NULL,

+    NULL,

+    NULL

+};

+

+/**

+ * Set window.external to the "external" object we created in C.

+ * That way external.callJava calls our C function.

+ */

+static void webkit_extension_install_external_object(WebKitScriptWorld *world, WebKitFrame *frame, guint64 page_id){

+

+  // Create the 'external' object.

+  JSGlobalContextRef context = webkit_frame_get_javascript_context_for_script_world (frame, world);

+  JSObjectRef globalObject = JSContextGetGlobalObject (context);

+  JSObjectRef externalObject = JSObjectMake (context, JSClassCreate(&external_object_definition), NULL);

+

+  // Add the pageId to the 'external' object.

+  JSStringRef name = JSStringCreateWithUTF8CString ("pageId");

+  JSValueRef number = JSValueMakeNumber (context, page_id);

+  JSObjectSetProperty (context, externalObject, name, number, 0, NULL);

+  JSStringRelease (name);

+

+  // Set the global variable external to the external object

+  name = JSStringCreateWithUTF8CString ("external");

+  JSObjectSetProperty (context, globalObject, name, externalObject, 0, NULL);

+  JSStringRelease (name);

+}

+

+static void

+window_object_cleared_callback (WebKitScriptWorld *world,

+                                WebKitWebPage     *web_page,

+                                WebKitFrame       *frame,

+                                gpointer           user_data)

+{

+

+  guint64 page_id = webkit_web_page_get_id (web_page);

+

+  // Install the "external" object.

+  webkit_extension_install_external_object(world, frame, page_id);

+

+  // Notify the main process

+  g_dbus_proxy_call (main_process_proxy,

+                     "webkit_extension_window_object_cleared",

+                     g_variant_new ("(tb)", page_id, webkit_frame_is_main_frame (frame)),

+                     G_DBUS_CALL_FLAGS_NONE,

+                     -1,

+                     NULL,

+                     NULL,

+                     NULL);

+}

+

+static gboolean webkit_extension_execute_script (const guint64 page_id, const gchar* script, const gchar* url){

+

+  WebKitFrame *main_frame = webkit_extension_get_main_frame (page_id);

+

+  JSStringRef url_string = JSStringCreateWithUTF8CString (url);

+  JSStringRef script_string = JSStringCreateWithUTF8CString (script);

+

+  JSGlobalContextRef context = webkit_frame_get_javascript_global_context (main_frame);

+

+  JSValueRef exception;

+  JSValueRef result = JSEvaluateScript(context, script_string, NULL, url_string, 0,  &exception);

+  if (!result){

+      JSStringRef exceptionIString = JSValueToStringCopy(context, exception, NULL);

+      size_t exceptionUTF8Size = JSStringGetMaximumUTF8CStringSize(exceptionIString);

+      char* exceptionUTF8 = (char*)malloc(exceptionUTF8Size);

+      JSStringGetUTF8CString(exceptionIString, exceptionUTF8, exceptionUTF8Size);

+      g_error("Failed to execute script exception: %s\n", exceptionUTF8);

+      free(exceptionUTF8);

+      JSStringRelease(exceptionIString);

+  }

+

+  JSStringRelease (url_string);

+  JSStringRelease (script_string);

+

+  return result != NULL;

+}

+

+static void

+webkit_extension_handle_method_call (GDBusConnection       *connection,

+                    const gchar           *sender,

+                    const gchar           *object_path,

+                    const gchar           *interface_name,

+                    const gchar           *method_name,

+                    GVariant              *parameters,

+                    GDBusMethodInvocation *invocation,

+                    gpointer               user_data)

+{

+

+  if (g_strcmp0(method_name, "webkit_extension_execute_script") == 0){

+      const gchar *script;

+      const gchar *url;

+      guint64 page_id;

+      g_variant_get(parameters, "(t&s&s)", &page_id, &script, &url;;

+      gboolean result = webkit_extension_execute_script (page_id, script, url);

+      g_dbus_method_invocation_return_value(invocation, g_variant_new("(b)", result));

+      return;

+  }

+

+  g_error ("UNKNOWN method %s\n", method_name);

+}

+

+static void setup_dbus_connection(){

+  GDBusConnection *bcon = g_bus_get_sync  (G_BUS_TYPE_SESSION, NULL,  NULL);

+  main_process_proxy = g_dbus_proxy_new_sync (bcon,

+      G_DBUS_PROXY_FLAGS_NONE,

+      NULL,

+      webkit_main_process_dbus_name,

+      webkit_main_process_dbus_path,

+      webkit_main_process_dbus_name,

+      NULL,

+      NULL);

+  g_assert (main_process_proxy != NULL);

+}

+

+static void notify_main_process_ready(){

+

+  // Notify the server that extension bus is ready.

+  g_dbus_proxy_call (main_process_proxy,

+                     "webkit_extension_ready",

+                     g_variant_new ("(ss)", webkit_extension_dbus_name, webkit_extension_dbus_path),

+                     G_DBUS_CALL_FLAGS_NONE,

+                     -1,

+                     NULL,

+                     NULL,

+                     NULL);

+}

+

+static const GDBusInterfaceVTable interface_vtable =

+  { webkit_extension_handle_method_call, NULL, NULL };

+

+static void

+on_bus_acquired (GDBusConnection *connection,

+                 const gchar     *name,

+                 gpointer         user_data)

+{

+  guint registration_id = g_dbus_connection_register_object(connection,

+      webkit_extension_dbus_path,

+      introspection_data->interfaces[0],

+      &interface_vtable, NULL, /* user_data */

+      NULL, /* user_data_free_func */

+      NULL); /* GError** */

+  g_assert(registration_id > 0);

+

+  setup_dbus_connection();

+  notify_main_process_ready();

+}

+

+G_MODULE_EXPORT void

+webkit_web_extension_initialize_with_user_data (WebKitWebExtension *extension, GVariant *user_data)

+{

+

+  this_extension = extension;

+

+  const gchar *unique_id = g_variant_get_string(user_data, NULL);

+  int id_length = strlen(unique_id);

+

+  //FIXME: free these pointers when the extension is being unloaded.

+  webkit_main_process_dbus_name = g_new (gchar, strlen(WEBKIT_MAIN_PROCESS_DBUS_NAME_PREFIX) + id_length + 1);

+  webkit_main_process_dbus_path = g_new (gchar, strlen(WEBKIT_MAIN_PROCESS_DBUS_PATH_PREFIX) + id_length + 1);

+  webkit_extension_dbus_name = g_new (gchar, strlen(WEBKIT_EXTENSION_DBUS_NAME_PREFIX) + id_length + 1);

+  webkit_extension_dbus_path = g_new (gchar, strlen(WEBKIT_EXTENSION_DBUS_PATH_PREFIX) + id_length + 1);

+  introspection_xml = g_new (gchar, strlen(introspection_xml_template) + strlen(WEBKIT_EXTENSION_DBUS_NAME_PREFIX) + id_length + 1);

+

+  g_sprintf (webkit_main_process_dbus_name, WEBKIT_MAIN_PROCESS_DBUS_NAME_PREFIX, unique_id);

+  g_sprintf (webkit_main_process_dbus_path, WEBKIT_MAIN_PROCESS_DBUS_PATH_PREFIX, unique_id);

+  g_sprintf (webkit_extension_dbus_name, WEBKIT_EXTENSION_DBUS_NAME_PREFIX, unique_id);

+  g_sprintf (webkit_extension_dbus_path, WEBKIT_EXTENSION_DBUS_PATH_PREFIX, unique_id);

+  g_sprintf (introspection_xml, introspection_xml_template, webkit_extension_dbus_name);

+

+  g_signal_connect (webkit_script_world_get_default (),

+                    "window-object-cleared",

+                    G_CALLBACK (window_object_cleared_callback),

+                    NULL);

+

+  // Setup DBus connection

+  guint owner_id;

+  introspection_data = g_dbus_node_info_new_for_xml (introspection_xml, NULL);

+  g_assert (introspection_data != NULL);

+

+  owner_id = g_bus_own_name (G_BUS_TYPE_SESSION,

+                             webkit_extension_dbus_name,

+                             G_BUS_NAME_OWNER_FLAGS_REPLACE | G_BUS_NAME_OWNER_FLAGS_ALLOW_REPLACEMENT,

+                             on_bus_acquired,

+                             NULL, /* on_name_acquired */

+                             NULL, /* on_name_lost */

+                             NULL,

+                             NULL);

+  g_assert (owner_id != 0);

+

+  // TODO: clean up on extension unload.

+  //  g_bus_unown_name (owner_id);

+  //  g_dbus_node_info_unref (introspection_data);

+}

diff --git eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkit_extension.h eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkit_extension.h

new file mode 100644

index 0000000..d127f9c

--- /dev/null

+++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkit_extension.h	

@@ -0,0 +1,73 @@

+/*******************************************************************************

+ * Copyright (c) 2014 Red Hat and others. 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 - initial API and implementation

+ *******************************************************************************/

+

+#ifndef INC_webkit_extension_H

+#define INC_webkit_extension_H

+

+#include <string.h>

+

+#include <glib.h>

+#include <glib/gprintf.h>

+

+#include <gio/gio.h>

+#include <stdlib.h>

+

+#include <unistd.h>

+#include <stdio.h>

+

+#include <webkit2/webkit-web-extension.h>

+

+#include <JavaScriptCore/JSContextRef.h>

+#include <JavaScriptCore/JSObjectRef.h>

+#include <JavaScriptCore/JSStringRef.h>

+

+#define WEBKIT_MAIN_PROCESS_DBUS_NAME_PREFIX "org.eclipse.webkit_main.%s"

+#define WEBKIT_MAIN_PROCESS_DBUS_PATH_PREFIX "/org/eclipse/webkit_main/%s"

+

+#define WEBKIT_EXTENSION_DBUS_NAME_PREFIX "org.eclipse.webkit_extension.%s"

+#define WEBKIT_EXTENSION_DBUS_PATH_PREFIX "/org/eclipse/webkit_extension/%s"

+

+static gchar* webkit_main_process_dbus_name;

+static gchar* webkit_main_process_dbus_path;

+

+static gchar* webkit_extension_dbus_name;

+static gchar* webkit_extension_dbus_path;

+

+static GDBusProxy *main_process_proxy;

+

+static GDBusNodeInfo *introspection_data = NULL;

+

+static gchar* introspection_xml;

+

+static gchar* introspection_xml_template =

+"<node>"

+  "<interface name='%s'>"

+

+    "<method name='webkit_extension_execute_script'>"

+      "<arg type='t' name='page_id' direction='in'/>"

+      "<arg type='s' name='script' direction='in'/>"

+      "<arg type='s' name='url' direction='in'/>"

+      "<arg type='b' name='result' direction='out'/>"

+    "</method>"

+

+  "</interface>"

+"</node>";

+

+WebKitWebExtension *this_extension;

+

+static GVariant * webkit_extension_convert_js_to_gvariant (JSContextRef context, JSValueRef value);

+static JSValueRef webkit_extension_convert_gvariant_to_js (JSContextRef context, GVariant * value);

+

+#endif /*INC_webkit_extension_H*/

diff --git eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.c eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.c

index 15b7761..3994f37 100644

--- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.c	

+++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.c	

@@ -2103,6 +2103,46 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1context_1set_1favicon

 }

 #endif

+#ifndef NO__1webkit_1web_1context_1set_1web_1extensions_1directory

+JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1context_1set_1web_1extensions_1directory)

+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)

+{

+	jbyte *lparg1=NULL;

+	WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1context_1set_1web_1extensions_1directory_FUNC);

+	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;

+/*

+	webkit_web_context_set_web_extensions_directory(arg0, lparg1);

+*/

+	{

+		WebKitGTK_LOAD_FUNCTION(fp, webkit_web_context_set_web_extensions_directory)

+		if (fp) {

+			((void (CALLING_CONVENTION*)(jintLong, jbyte *))fp)(arg0, lparg1);

+		}

+	}

+fail:

+	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);

+	WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1context_1set_1web_1extensions_1directory_FUNC);

+}

+#endif

+

+#ifndef NO__1webkit_1web_1context_1set_1web_1extensions_1initialization_1user_1data

+JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1context_1set_1web_1extensions_1initialization_1user_1data)

+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)

+{

+	WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1context_1set_1web_1extensions_1initialization_1user_1data_FUNC);

+/*

+	webkit_web_context_set_web_extensions_initialization_user_data(arg0, arg1);

+*/

+	{

+		WebKitGTK_LOAD_FUNCTION(fp, webkit_web_context_set_web_extensions_initialization_user_data)

+		if (fp) {

+			((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1);

+		}

+	}

+	WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1context_1set_1web_1extensions_1initialization_1user_1data_FUNC);

+}

+#endif

+

 #ifndef NO__1webkit_1web_1data_1source_1get_1data

 JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1data_1source_1get_1data)

 	(JNIEnv *env, jclass that, jintLong arg0)

@@ -2501,6 +2541,26 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1main_1fram

 }

 #endif

+#ifndef NO__1webkit_1web_1view_1get_1page_1id

+JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1page_1id)

+	(JNIEnv *env, jclass that, jintLong arg0)

+{

+	jintLong rc = 0;

+	WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1get_1page_1id_FUNC);

+/*

+	rc = (jintLong)webkit_web_view_get_page_id(arg0);

+*/

+	{

+		WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_get_page_id)

+		if (fp) {

+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);

+		}

+	}

+	WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1get_1page_1id_FUNC);

+	return rc;

+}

+#endif

+

 #ifndef NO__1webkit_1web_1view_1get_1progress

 JNIEXPORT jdouble JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1progress)

 	(JNIEnv *env, jclass that, jintLong arg0)

diff --git eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_stats.c eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_stats.c

index c3cf9ee..b0e6650 100644

--- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_stats.c	

+++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_stats.c	

@@ -123,6 +123,8 @@ char * WebKitGTK_nativeFunctionNames[] = {

 	"_1webkit_1uri_1response_1get_1mime_1type",

 	"_1webkit_1web_1context_1get_1default",

 	"_1webkit_1web_1context_1set_1favicon_1database_1directory",

+	"_1webkit_1web_1context_1set_1web_1extensions_1directory",

+	"_1webkit_1web_1context_1set_1web_1extensions_1initialization_1user_1data",

 	"_1webkit_1web_1data_1source_1get_1data",

 	"_1webkit_1web_1data_1source_1get_1encoding",

 	"_1webkit_1web_1frame_1get_1data_1source",

@@ -143,6 +145,7 @@ char * WebKitGTK_nativeFunctionNames[] = {

 	"_1webkit_1web_1view_1get_1estimated_1load_1progress",

 	"_1webkit_1web_1view_1get_1load_1status",

 	"_1webkit_1web_1view_1get_1main_1frame",

+	"_1webkit_1web_1view_1get_1page_1id",

 	"_1webkit_1web_1view_1get_1progress",

 	"_1webkit_1web_1view_1get_1settings",

 	"_1webkit_1web_1view_1get_1title",

diff --git eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_stats.h eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_stats.h

index e14e8f6..7b939e9 100644

--- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_stats.h	

+++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_stats.h	

@@ -133,6 +133,8 @@ typedef enum {

 	_1webkit_1uri_1response_1get_1mime_1type_FUNC,

 	_1webkit_1web_1context_1get_1default_FUNC,

 	_1webkit_1web_1context_1set_1favicon_1database_1directory_FUNC,

+	_1webkit_1web_1context_1set_1web_1extensions_1directory_FUNC,

+	_1webkit_1web_1context_1set_1web_1extensions_1initialization_1user_1data_FUNC,

 	_1webkit_1web_1data_1source_1get_1data_FUNC,

 	_1webkit_1web_1data_1source_1get_1encoding_FUNC,

 	_1webkit_1web_1frame_1get_1data_1source_FUNC,

@@ -153,6 +155,7 @@ typedef enum {

 	_1webkit_1web_1view_1get_1estimated_1load_1progress_FUNC,

 	_1webkit_1web_1view_1get_1load_1status_FUNC,

 	_1webkit_1web_1view_1get_1main_1frame_FUNC,

+	_1webkit_1web_1view_1get_1page_1id_FUNC,

 	_1webkit_1web_1view_1get_1progress_FUNC,

 	_1webkit_1web_1view_1get_1settings_FUNC,

 	_1webkit_1web_1view_1get_1title_FUNC,

diff --git eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_structs.c eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_structs.c

index 5324bd8..8ad1c78 100644

--- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_structs.c	

+++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_structs.c	

@@ -1,5 +1,5 @@

 /*******************************************************************************

- * Copyright (c) 2009, 2011 IBM Corporation and others. All rights reserved.

+ * Copyright (c) 2009, 2014 IBM Corporation and others. 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

diff --git eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java

index 7ef6236..0e00c09 100644

--- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java	

+++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java	

@@ -11,12 +11,15 @@

 package org.eclipse.swt.browser;

+import java.io.File;

 import java.io.UnsupportedEncodingException;

 import java.net.MalformedURLException;

 import java.net.URL;

 import java.util.Enumeration;

+import java.util.HashMap;

 import java.util.Hashtable;

 import java.util.StringTokenizer;

+import java.util.UUID;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.SWTException;

@@ -27,6 +30,7 @@ import org.eclipse.swt.internal.C;

 import org.eclipse.swt.internal.Callback;

 import org.eclipse.swt.internal.Compatibility;

 import org.eclipse.swt.internal.Converter;

+import org.eclipse.swt.internal.GVariantConverter;

 import org.eclipse.swt.internal.LONG;

 import org.eclipse.swt.internal.Library;

 import org.eclipse.swt.internal.gtk.GdkEventKey;

@@ -49,6 +53,8 @@ import org.eclipse.swt.widgets.Shell;

 @SuppressWarnings({"rawtypes", "unchecked"})

 class WebKit extends WebBrowser {

 	long /*int*/ webView, webViewData, scrolledWindow;

+	long pageId;

+

 	int failureCount, lastKeyCode, lastCharCode;

 	String postData;

 	String[] headers;

@@ -56,10 +62,61 @@ class WebKit extends WebBrowser {

 	byte[] htmlBytes;

 	BrowserFunction eventFunction;

+	/**

+	 * A hash map to keep the results of Java Script executions. The result is

+	 * mapped to the value of jsCounter at the time of execution so that the

+	 * polling loop can find the correct result

+	 */

+	private static HashMap<Integer, Long> jsResults = new HashMap<Integer, Long>();

+

+	/**

+	 * A counter that is incremented each time @link

+	 * {@link WebKit#webkit_extension_execute_script(String, String)} is called

+	 * and as a unique reference to that script run.

+	 */

+	private static int jsCounter = 0;

+

+	private static long /*int*/ dbus_proxy = 0;

+

 	static int DisabledJSCount;

 	static long /*int*/ ExternalClass, PostString, WebViewType;

 	static boolean IsWebKit14orNewer, LibraryLoaded;

 	static Hashtable WindowMappings = new Hashtable ();

+	static HashMap<Long, WebKit> browserIdMappings = new HashMap<Long, WebKit>();

+

+	private static final String WEBKIT_MAIN_PROCESS_DBUS_NAME_PREFIX = "org.eclipse.webkit_main.";

+	private static final String WEBKIT_MAIN_PROCESS_DBUS_PATH_PREFIX = "/org/eclipse/webkit_main/";

+

+	private static String uniqueDBusID;

+	private static String mainProcessDBusName;

+	private static String mainProcessDBusPath;

+

+	/* Introspection data out main WebKit process. This specifies the

+	 * interface that the extension will expect to see. */

+	private static String dbusIntrospectionXml =

+	"<node>" +

+	  "<interface name='%s'>" +

+

+	    "<method name='webkit_extension_ready'>" +

+	      "<arg type='s' name='extension_dbus_name' direction='in'/>" +

+	      "<arg type='s' name='extension_dbus_path' direction='in'/>" +

+	    "</method>" +

+

+	    "<method name='webkit_extension_window_object_cleared'>" +

+	      "<arg type='t' name='pageId' direction='in'/>" +

+	      "<arg type='b' name='isMainFrame' direction='in'/>" +

+	    "</method>" +

+

+	    "<method name='webkit_extension_external_object_callJava'>" +

+	      "<arg type='t' name='pageId' direction='in'/>" +

+	      "<arg type='d' name='id' direction='in'/>" +

+	      "<arg type='s' name='token' direction='in'/>" +

+	      "<arg type='r' name='arguments' direction='in'/>" +

+	      "<arg type='*' name='result' direction='out'/>" +

+	    "</method>" +

+

+	"</interface>" +

+	"</node>";

 	static final String ABOUT_BLANK = "about:blank"; //$NON-NLS-1$

 	static final String CHARSET_UTF8 = "UTF-8"; //$NON-NLS-1$

@@ -122,6 +179,12 @@ class WebKit extends WebBrowser {

 	static Callback JSObjectHasPropertyProc, JSObjectGetPropertyProc, JSObjectCallAsFunctionProc;

 	static Callback JSDOMEventProc;

+	private static Callback connectedToExtensionCallback;

+	private static Callback busAcquiredCallback;

+	private static Callback handleDbusFunctionCallCallbackObject;

+	private static Callback executeJavaScriptFinishedCallback;

+	private static Callback webkit_initialize_web_extensions_callback;

+

 	static boolean WEBKIT2;

 	static {

@@ -137,6 +200,22 @@ class WebKit extends WebBrowser {

 			WebViewType = WebKitGTK.webkit_web_view_get_type ();

+			if (WEBKIT2){

+				long /*int*/ webContext = WebKitGTK.webkit_web_context_get_default();

+

+				webkit_initialize_web_extensions_callback = new Callback(WebKit.class, "webkit_initialize_web_extensions", 2);

+				OS.g_signal_connect (webContext, WebKitGTK.initialize_web_extensions, webkit_initialize_web_extensions_callback.getAddress(), 0);

+

+				setUpExtensionConnection();

+				//TODO: Perhaps a directory can be created inside SWT_LIBRARY_PATH for the extension.

+				//      That way webkit wouldn't attempt to load unrelated .so's as extensions