Imported WebKit commit 9a52e27980f47e8b0d8f8b7cc0fd7b5741bceb92 (http://svn.webkit.org/repository/webkit/trunk@116736)

New snapshot to include QDeclarative* -> QQml* build fixes

1 files changed, 7 insertions, 1 deletions

diff --git a/Source/WebKit2/UIProcess/WebContext.cpp b/Source/WebKit2/UIProcess/WebContext.cpp
index f1a0f0fb7..b6258ece1 100644
--- a/Source/WebKit2/UIProcess/WebContext.cpp
+++ b/Source/WebKit2/UIProcess/WebContext.cpp
@@ -620,7 +620,7 @@ void WebContext::getPlugins(bool refresh, Vector<PluginInfo>& pluginInfos)
 #endif
 }
 
-void WebContext::getPluginPath(const String& mimeType, const String& urlString, String& pluginPath)
+void WebContext::getPluginPath(const String& mimeType, const String& urlString, String& pluginPath, bool& blocked)
 {
     MESSAGE_CHECK_URL(urlString);
 
@@ -630,6 +630,12 @@ void WebContext::getPluginPath(const String& mimeType, const String& urlString,
     if (!plugin.path)
         return;
 
+    blocked = false;
+    if (pluginInfoStore().shouldBlockPlugin(plugin)) {
+        blocked = true;
+        return;
+    }
+
     pluginPath = plugin.path;
 }