diff options
| author | Leo Ufimtsev | 2017-03-10 19:54:08 +0000 |
|---|---|---|
| committer | Alexander Kurtakov | 2017-03-11 08:53:52 +0000 |
| commit | 08f0fe88dce9b824dd981b8cac6e46f48fdccbe0 (patch) | |
| tree | add7e8c5c365ac92594c324d3e95c53883ee5314 | |
| parent | 4899004f5a22a728a15653110e2a046f9adb2d10 (diff) | |
| download | eclipse.platform.swt-08f0fe88dce9b824dd981b8cac6e46f48fdccbe0.tar.gz eclipse.platform.swt-08f0fe88dce9b824dd981b8cac6e46f48fdccbe0.tar.xz eclipse.platform.swt-08f0fe88dce9b824dd981b8cac6e46f48fdccbe0.zip | |
Bug 511228: [Webkit2] Ensure proper settings are used for webkit2.
Adding missing "allow_universal_access_from_file_urls" option.
It's enabled on Webkit1, but has not yet been ported to Webkit2.
Change-Id: I0c933c697108ae67f02ab78ec0d83c40d135aab0
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=511228
Signed-off-by: Leo Ufimtsev <lufimtse@redhat.com>
| -rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java | 1 | ||||
| -rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/internal/webkit/WebKitGTK.java | 11 |
2 files changed, 7 insertions, 5 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 faade5e38e..310ede062e 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 @@ -865,6 +865,7 @@ public void create (Composite parent, int style) { if (WEBKIT2){ OS.g_object_set (settings, WebKitGTK.default_charset, bytes, 0); + OS.g_object_set (settings, WebKitGTK.allow_universal_access_from_file_urls, 1, 0); } else { OS.g_object_set (settings, WebKitGTK.default_encoding, bytes, 0); OS.g_object_set (settings, WebKitGTK.enable_universal_access_from_file_uris, 1, 0); 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 471201ed86..40e09225ce 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 @@ -85,8 +85,6 @@ public class WebKitGTK extends C { - - // Properties: // Webkit1: https://webkitgtk.org/reference/webkitgtk/unstable/WebKitWebSettings.html#WebKitWebSettings.properties // Webkit2: https://webkitgtk.org/reference/webkit2gtk/unstable/WebKitSettings.html#WebKitSettings.properties @@ -99,15 +97,18 @@ public class WebKitGTK extends C { // Note: // - Some settings in Webkit2 have changed. It's not safe to use webkit1 settings on webkit2. // - On webkit2 you can also use the newly introduced functions for getting/setting settings as well as g_object_set(). - public static final byte[] default_encoding = ascii ("default-encoding"); // $NON-NLS-1$ - public static final byte[] default_charset = ascii ("default-charset"); // $NON-NLS-1$ + public static final byte[] default_encoding = ascii ("default-encoding"); // $NON-NLS-1$ // Webkit1 only + public static final byte[] default_charset = ascii ("default-charset"); // $NON-NLS-1$ // Webkit2 only public static final byte[] enable_scripts = ascii ("enable-scripts"); // $NON-NLS-1$ // Webkit1 only. public static final byte[] enable_javascript = ascii ("enable-javascript"); // $NON-NLS-1$ // Webkit2 only public static final byte[] enable_plugins = ascii("enable-plugins"); // $NON-NLS-1$ public static final byte[] enable_webgl = ascii("enable-webgl"); // $NON-NLS-1$ - public static final byte[] enable_universal_access_from_file_uris = ascii ("enable-universal-access-from-file-uris"); // $NON-NLS-1$ + + public static final byte[] enable_universal_access_from_file_uris = ascii ("enable-universal-access-from-file-uris"); // $NON-NLS-1$ // Webkit1 + public static final byte[] allow_universal_access_from_file_urls = ascii ("allow-universal-access-from-file-urls"); // $NON-NLS-1$ // Webkit2 + public static final byte[] height = ascii ("height"); // $NON-NLS-1$ public static final byte[] javascript_can_open_windows_automatically = ascii ("javascript-can-open-windows-automatically"); // $NON-NLS-1$ public static final byte[] locationbar_visible = ascii ("locationbar-visible"); // $NON-NLS-1$ |