Changeset 241844 in webkit

Timestamp:

Feb 20, 2019 3:26:54 PM (5 years ago)

Author:

Truitt Savell

Message:

Unreviewed, rolling out r241817.

Caused 4 API failures

Reverted changeset:

"[GTK] Epiphany searching for plugins even if plugins are
disabled"
​https://bugs.webkit.org/show_bug.cgi?id=194352
​https://trac.webkit.org/changeset/241817

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/Plugins/WebPluginInfoProvider.cpp (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-02-20  Truitt Savell  <tsavell@apple.com>
+
+        Unreviewed, rolling out r241817.
+
+        Caused 4 API failures
+
+        Reverted changeset:
+
+        "[GTK] Epiphany searching for plugins even if plugins are
+        disabled"
+        https://bugs.webkit.org/show_bug.cgi?id=194352
+        https://trac.webkit.org/changeset/241817
+
 2019-02-20  Andy Estes  <aestes@apple.com>
 

trunk/Source/WebKit/WebProcess/Plugins/WebPluginInfoProvider.cpp

@@ -37 +37 @@
 #include <WebCore/Page.h>
 #include <WebCore/SchemeRegistry.h>
-#include <WebCore/Settings.h>
 #include <WebCore/SubframeLoader.h>
 #include <wtf/text/StringHash.h>
@@ -148 +147 @@
 {
     if (!m_pluginCacheIsPopulated) {
-        if (page.settings().arePluginsEnabled()) {
-            HangDetectionDisabler hangDetectionDisabler;
-            if (!WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebProcessProxy::GetPlugins(m_shouldRefreshPlugins),
-                Messages::WebProcessProxy::GetPlugins::Reply(m_cachedPlugins, m_cachedApplicationPlugins, m_cachedSupportedPluginIdentifiers), 0))
-                return;
-        }
+        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;