|
 |
e1c5f1b |
--- "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java.orig" 2016-04-29 11:07:16.540479847 +0100
|
|
|
e1c5f1b |
+++ "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java" 2016-04-29 11:10:18.983883107 +0100
|
|
|
e1c5f1b |
@@ -110,7 +110,9 @@
|
|
|
e1c5f1b |
|
|
|
e1c5f1b |
if (LibraryLoaded) {
|
|
|
e1c5f1b |
String webkit2 = System.getenv("SWT_WEBKIT2"); // $NON-NLS-1$
|
|
|
e1c5f1b |
- WEBKIT2 = webkit2 != null && webkit2.equals("1") && OS.GTK3; // $NON-NLS-1$
|
|
|
e1c5f1b |
+ if (OS.GTK3) {
|
|
|
e1c5f1b |
+ WEBKIT2 = webkit2 == null || webkit2.equals("1"); // $NON-NLS-1$
|
|
|
e1c5f1b |
+ }
|
|
|
e1c5f1b |
|
|
|
e1c5f1b |
WebViewType = WebKitGTK.webkit_web_view_get_type ();
|
|
|
e1c5f1b |
|
|
|
e1c5f1b |
--- "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.h.orig" 2016-04-29 11:05:57.597603451 +0100
|
|
|
e1c5f1b |
+++ "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.h" 2016-04-29 11:07:04.101656890 +0100
|
|
|
e1c5f1b |
@@ -29,10 +29,10 @@
|
|
|
e1c5f1b |
char *gtk3 = getenv("SWT_GTK3"); \
|
|
|
e1c5f1b |
if (gtk3 == NULL || strcmp(gtk3, "1") == 0) { \
|
|
|
e1c5f1b |
char *webkit2 = getenv("SWT_WEBKIT2"); \
|
|
|
e1c5f1b |
- if (webkit2 != NULL && strcmp(webkit2, "1") == 0) { \
|
|
|
e1c5f1b |
- handle = dlopen("libwebkit2gtk-4.0.so.37", LOAD_FLAGS); /* webkit2 */ \
|
|
|
e1c5f1b |
- } else { \
|
|
|
e1c5f1b |
+ if (webkit2 != NULL && strcmp(webkit2, "0") == 0) { \
|
|
|
e1c5f1b |
handle = dlopen("libwebkitgtk-3.0.so.0", LOAD_FLAGS); /* webkitgtk >= 3.x lib */ \
|
|
|
e1c5f1b |
+ } else { \
|
|
|
e1c5f1b |
+ handle = dlopen("libwebkit2gtk-4.0.so.37", LOAD_FLAGS); /* webkit2 */ \
|
|
|
e1c5f1b |
} \
|
|
|
e1c5f1b |
} else { \
|
|
|
e1c5f1b |
handle = dlopen("libwebkit-1.0.so.2", LOAD_FLAGS); /* webkitgtk 1.2.x lib */ \
|
|
|
e1c5f1b |
--- "./eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Browser/gtk/org/eclipse/swt/browser/BrowserFactory.java.orig" 2016-04-29 12:15:18.524027606 +0100
|
|
|
e1c5f1b |
+++ "./eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Browser/gtk/org/eclipse/swt/browser/BrowserFactory.java" 2016-04-29 12:20:19.696980780 +0100
|
|
|
e1c5f1b |
@@ -16,9 +16,6 @@
|
|
|
e1c5f1b |
|
|
|
e1c5f1b |
WebBrowser createWebBrowser (int style) {
|
|
|
e1c5f1b |
boolean webkitInstalled = WebKit.IsInstalled ();
|
|
|
e1c5f1b |
- if ((style & SWT.MOZILLA) != 0 || (!webkitInstalled && (style & SWT.WEBKIT) == 0)) {
|
|
|
e1c5f1b |
- return new Mozilla ();
|
|
|
e1c5f1b |
- }
|
|
|
e1c5f1b |
if (!webkitInstalled) return null;
|
|
|
e1c5f1b |
|
|
|
e1c5f1b |
return new WebKit ();
|