Attachment 287861 Details for Bug 158697 – Patch

[patch] Patch

bug-158697-20160903093553.patch (text/plain), 2.84 KB, created by Michael Catanzaro on 2016-09-03 07:38:12 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Catanzaro

Created: 2016-09-03 07:38:12 PDT

Size: 2.84 KB

patch

obsolete

>Subversion Revision: 205400
>diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
>index 587823df7b60e4ce79ca5f94d99c99e49ff81228..fd90d3aced81452ed0d5a85975c3b64506eea10f 100644
>--- a/Source/WebKit2/ChangeLog
>+++ b/Source/WebKit2/ChangeLog
>@@ -1,3 +1,21 @@
>+2016-09-03  Michael Catanzaro  <mcatanzaro@igalia.com>
>+
>+        [GTK][Wayland] evince-browser-plugin prevents viewing PDFs
>+        https://bugs.webkit.org/show_bug.cgi?id=158697
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Currently the evince browser plugin makes it impossible to view or download PDFs when
>+        running in Wayland. The only solution I've found is to uninstall the plugin, but users can
>+        hardly be expected to know to do this. Workaround the issue by disabling all NPAPI plugins
>+        when running in Wayland. This is not really right, as we have support for windowless NPAPI
>+        plugins, but that support is clearly not ready for prime time if it blocks downloading PDFs.
>+
>+        * UIProcess/API/gtk/WebKitSettings.cpp:
>+        (webkit_settings_set_enable_plugins):
>+        * UIProcess/gtk/WebPreferencesGtk.cpp:
>+        (WebKit::WebPreferences::platformInitializeStore):
>+
> 2016-09-02  Michael Catanzaro  <mcatanzaro@igalia.com>
> 
>         [GTK] -Wmissing-field-initializers on WaylandCompositor.cpp:295
>diff --git a/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp b/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp
>index 4ba4ac648f7f784bbd0c8b20707d9572e339b174..4a59d665bfece5ddbf026c00d540c0e5fa0d1420 100644
>--- a/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp
>+++ b/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp
>@@ -1621,6 +1621,12 @@ void webkit_settings_set_enable_plugins(WebKitSettings* settings, gboolean enabl
> {
>     g_return_if_fail(WEBKIT_IS_SETTINGS(settings));
> 
>+#if PLATFORM(WAYLAND)
>+    // https://bugs.webkit.org/show_bug.cgi?id=158697
>+    if (WebCore::PlatformDisplay::sharedDisplay().type() == WebCore::PlatformDisplay::Type::Wayland)
>+        return;
>+#endif
>+
>     WebKitSettingsPrivate* priv = settings->priv;
>     bool currentValue = priv->preferences->pluginsEnabled();
>     if (currentValue == enabled)
>diff --git a/Source/WebKit2/UIProcess/gtk/WebPreferencesGtk.cpp b/Source/WebKit2/UIProcess/gtk/WebPreferencesGtk.cpp
>index 3f0585d50c3322b87a408eb3c3f097b9df9eb3f2..37f9d97365a74ea001685518790dc4d4ab448edd 100644
>--- a/Source/WebKit2/UIProcess/gtk/WebPreferencesGtk.cpp
>+++ b/Source/WebKit2/UIProcess/gtk/WebPreferencesGtk.cpp
>@@ -73,6 +73,13 @@ void WebPreferences::platformInitializeStore()
> #endif
> 
> #endif // ENABLE(OPENGL)
>+
>+#if PLATFORM(WAYLAND)
>+    if (PlatformDisplay::sharedDisplay().type() == PlatformDisplay::Type::Wayland) {
>+        // https://bugs.webkit.org/show_bug.cgi?id=158697
>+        setPluginsEnabled(false);
>+    }
>+#endif
> }
> 
> void WebPreferences::platformUpdateStringValueForKey(const String&, const String&)

Flags:

cgarcia: review-

Actions: View | Formatted Diff | Diff

Attachments on bug 158697: 287861 | 288004 | 288012