XULRunner 10

1 files changed, 24 insertions, 14 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/gtk/org/eclipse/swt/browser/MozillaDelegate.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/gtk/org/eclipse/swt/browser/MozillaDelegate.java
index 1d91ff169d..a656875e9b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/gtk/org/eclipse/swt/browser/MozillaDelegate.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/gtk/org/eclipse/swt/browser/MozillaDelegate.java
@@ -73,14 +73,36 @@ static String getLibraryName () {
 	return "libxpcom.so"; //$NON-NLS-1$
 }
 
-String getJSLibraryName_Pre4() {
-	return "libxpcom.so";
+static String getJSLibraryName () {
+	return "libmozjs.so"; //$NON-NLS-1$
+}
+
+static String getJSLibraryName_Pre4() {
+	return "libxpcom.so"; //$NON-NLS-1$
+}
+
+static String getSWTInitLibraryName () {
+	return "swt-xpcominit"; //$NON-NLS-1$
+}
+
+static void loadAdditionalLibraries (String mozillaPath) {
+// the following is intentionally commented
+
+//	if (!Mozilla.IsPre_4) {
+//		System.loadLibrary ("swt-xulrunner10"); // get it extracted
+//		byte[] bytes = Converter.wcsToMbcs (null, /* path to libswt-xulrunner10.so */ "", true); //$NON-NLS-1$
+//		OS.dlopen (bytes, OS.RTLD_NOW | OS.RTLD_GLOBAL);
+//	}
 }
 
 static char[] mbcsToWcs (String codePage, byte [] buffer) {
 	return Converter.mbcsToWcs (codePage, buffer);
 }
 
+static boolean needsSpinup () {
+	return true;
+}
+
 static byte[] wcsToMbcs (String codePage, String string, boolean terminate) {
 	return Converter.wcsToMbcs (codePage, string, terminate);
 }
@@ -109,19 +131,11 @@ int /*long*/ getHandle () {
 	return embedHandle;
 }
 
-String getJSLibraryName () {
-	return "libmozjs.so"; //$NON-NLS-1$
-}
-
 String getProfilePath () {
 	String baseDir = System.getProperty ("user.home"); //$NON-NLS-1$
 	return baseDir + Mozilla.SEPARATOR_OS + ".mozilla" + Mozilla.SEPARATOR_OS + "eclipse"; //$NON-NLS-1$ //$NON-NLS-2$
 }
 
-static String GetSWTInitLibraryName () {
-	return "swt-xpcominit"; //$NON-NLS-1$
-}
-
 int /*long*/ gtk_event (int /*long*/ handle, int /*long*/ gdkEvent, int /*long*/ pointer) {
 	GdkEvent event = new GdkEvent ();
 	OS.memmove (event, gdkEvent, GdkEvent.sizeof);
@@ -216,10 +230,6 @@ void init () {
 	}
 }
 
-boolean needsSpinup () {
-	return true;
-}
-
 void onDispose (int /*long*/ embedHandle) {
 	if (listener != null) {
 		eventShell.getDisplay ().removeFilter (SWT.FocusIn, listener);