Attachment 362602 Details for Bug 194352 – Patch for landing

[patch] Patch for landing

wk2-plugins-disabled.diff (text/plain), 2.55 KB, created by Carlos Garcia Campos on 2019-02-21 03:37:27 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Carlos Garcia Campos

Created: 2019-02-21 03:37:27 PST

Size: 2.55 KB

patch

obsolete

>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 92c66d4dcfa..d80ead6665c 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,15 @@
>+2019-02-21  Carlos Garcia Campos  <cgarcia@igalia.com>
>+
>+        [GTK] Epiphany searching for plugins even if plugins are disabled
>+        https://bugs.webkit.org/show_bug.cgi?id=194352
>+
>+        Reviewed by Michael Catanzaro.
>+
>+        Check pluginsEnabled setting before trying to get plugins from UI process.
>+
>+        * WebProcess/Plugins/WebPluginInfoProvider.cpp:
>+        (WebKit::WebPluginInfoProvider::populatePluginCache):
>+
> 2019-02-20  Antti Koivisto  <antti@apple.com>
> 
>         Make programmatic frame scrolling work on iOS
>diff --git a/Source/WebKit/WebProcess/Plugins/WebPluginInfoProvider.cpp b/Source/WebKit/WebProcess/Plugins/WebPluginInfoProvider.cpp
>index 5455b30f40e..76840642eef 100644
>--- a/Source/WebKit/WebProcess/Plugins/WebPluginInfoProvider.cpp
>+++ b/Source/WebKit/WebProcess/Plugins/WebPluginInfoProvider.cpp
>@@ -36,6 +36,7 @@
> #include <WebCore/FrameLoader.h>
> #include <WebCore/Page.h>
> #include <WebCore/SchemeRegistry.h>
>+#include <WebCore/Settings.h>
> #include <WebCore/SubframeLoader.h>
> #include <wtf/text/StringHash.h>
> 
>@@ -146,11 +147,18 @@ Vector<WebCore::PluginInfo> WebPluginInfoProvider::webVisiblePluginInfo(Page& pa
> void WebPluginInfoProvider::populatePluginCache(const WebCore::Page& page)
> {
>     if (!m_pluginCacheIsPopulated) {
>-        HangDetectionDisabler hangDetectionDisabler;
>-
>-        if (!WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebProcessProxy::GetPlugins(m_shouldRefreshPlugins),
>-            Messages::WebProcessProxy::GetPlugins::Reply(m_cachedPlugins, m_cachedApplicationPlugins, m_cachedSupportedPluginIdentifiers), 0))
>-            return;
>+#if PLATFORM(COCOA)
>+        // Application plugins are not affected by enablePlugins setting, so we always need to scan plugins to get them.
>+        bool shouldScanPlugins = true;
>+#else
>+        bool shouldScanPlugins = page.mainFrame().loader().subframeLoader().allowPlugins();
>+#endif
>+        if (shouldScanPlugins) {
>+            HangDetectionDisabler hangDetectionDisabler;
>+            if (!WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebProcessProxy::GetPlugins(m_shouldRefreshPlugins),
>+                Messages::WebProcessProxy::GetPlugins::Reply(m_cachedPlugins, m_cachedApplicationPlugins, m_cachedSupportedPluginIdentifiers), 0))
>+                return;
>+        }
> 
>         m_shouldRefreshPlugins = false;
>         m_pluginCacheIsPopulated = true;

Actions: View | Formatted Diff | Diff

Attachments on bug 194352: 361906 | 362602