Title: [241844] trunk/Source/WebKit
Revision
241844
Author
[email protected]
Date
2019-02-20 15:26:54 -0800 (Wed, 20 Feb 2019)

Log 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

Modified Paths

Diff

Modified: trunk/Source/WebKit/ChangeLog (241843 => 241844)


--- trunk/Source/WebKit/ChangeLog	2019-02-20 23:25:23 UTC (rev 241843)
+++ trunk/Source/WebKit/ChangeLog	2019-02-20 23:26:54 UTC (rev 241844)
@@ -1,3 +1,16 @@
+2019-02-20  Truitt Savell  <[email protected]>
+
+        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  <[email protected]>
 
         [Xcode] Add SDKVariant.xcconfig to various Xcode projects

Modified: trunk/Source/WebKit/WebProcess/Plugins/WebPluginInfoProvider.cpp (241843 => 241844)


--- trunk/Source/WebKit/WebProcess/Plugins/WebPluginInfoProvider.cpp	2019-02-20 23:25:23 UTC (rev 241843)
+++ trunk/Source/WebKit/WebProcess/Plugins/WebPluginInfoProvider.cpp	2019-02-20 23:26:54 UTC (rev 241844)
@@ -36,7 +36,6 @@
 #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>
 
@@ -147,13 +146,12 @@
 void WebPluginInfoProvider::populatePluginCache(const WebCore::Page& page)
 {
     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;
         m_pluginCacheIsPopulated = true;
     }
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to