[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.22-985-g3c00f00

[pkasting at chromium.org]

The following commit has been merged in the webkit-1.1 branch:
commit 3fd7c28524bc2b315a432cbc67a8137cfdf1a03a
Author: pkasting at chromium.org <pkasting at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Feb 25 00:17:05 2010 +0000

    Add call to FrameLoaderClient::allowPlugins everywhere arePluginsEnabled is called
    https://bugs.webkit.org/show_bug.cgi?id=34997
    
    Patch by Adam Barth <abarth at webkit.org> on 2010-02-24
    Reviewed by Darin Fisher.
    
    If we want to let the FrameLoaderClient override arePluginsEnabled,
    then we need to call out to the FrameLoaderClient every time we read
    the setting.
    
    We don't have testing infrustructure for these changes, which is lame.
    I'm supposed to fix that in Bug 33991.
    
    * dom/DOMImplementation.cpp:
    (WebCore::DOMImplementation::createDocument):
    * loader/MainResourceLoader.cpp:
    (WebCore::MainResourceLoader::substituteMIMETypeFromPluginDatabase):
    * loader/PluginDocument.cpp:
    (WebCore::PluginTokenizer::writeRawData):
    * page/Page.cpp:
    (WebCore::Page::pluginData):
    * plugins/MimeType.cpp:
    (WebCore::MimeType::enabledPlugin):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55206 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 1b91289..6ff4a1b 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,28 @@
+2010-02-24  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Darin Fisher.
+
+        Add call to FrameLoaderClient::allowPlugins everywhere arePluginsEnabled is called
+        https://bugs.webkit.org/show_bug.cgi?id=34997
+
+        If we want to let the FrameLoaderClient override arePluginsEnabled,
+        then we need to call out to the FrameLoaderClient every time we read
+        the setting.
+
+        We don't have testing infrustructure for these changes, which is lame.
+        I'm supposed to fix that in Bug 33991.
+
+        * dom/DOMImplementation.cpp:
+        (WebCore::DOMImplementation::createDocument):
+        * loader/MainResourceLoader.cpp:
+        (WebCore::MainResourceLoader::substituteMIMETypeFromPluginDatabase):
+        * loader/PluginDocument.cpp:
+        (WebCore::PluginTokenizer::writeRawData):
+        * page/Page.cpp:
+        (WebCore::Page::pluginData):
+        * plugins/MimeType.cpp:
+        (WebCore::MimeType::enabledPlugin):
+
 2010-02-24  James Robinson  <jamesr at chromium.org>
 
         Reviewed by Dmitry Titov.
diff --git a/WebCore/dom/DOMImplementation.cpp b/WebCore/dom/DOMImplementation.cpp
index f7c8242..4a0082d 100644
--- a/WebCore/dom/DOMImplementation.cpp
+++ b/WebCore/dom/DOMImplementation.cpp
@@ -31,6 +31,7 @@
 #include "Element.h"
 #include "ExceptionCode.h"
 #include "Frame.h"
+#include "FrameLoaderClient.h"
 #include "FTPDirectoryDocument.h"
 #include "HTMLDocument.h"
 #include "HTMLNames.h"
@@ -337,7 +338,7 @@ PassRefPtr<Document> DOMImplementation::createDocument(const String& type, Frame
 #endif
 
     PluginData* pluginData = 0;
-    if (frame && frame->page() && frame->page()->settings()->arePluginsEnabled())
+    if (frame && frame->page() && frame->loader()->client()->allowPlugins(frame->page()->settings()->arePluginsEnabled()))
         pluginData = frame->page()->pluginData();
 
     // PDF is one image type for which a plugin can override built-in support.
diff --git a/WebCore/loader/MainResourceLoader.cpp b/WebCore/loader/MainResourceLoader.cpp
index 3e75880..d7467d1 100644
--- a/WebCore/loader/MainResourceLoader.cpp
+++ b/WebCore/loader/MainResourceLoader.cpp
@@ -285,7 +285,7 @@ void MainResourceLoader::continueAfterContentPolicy(PolicyAction policy)
 #if PLATFORM(QT)
 void MainResourceLoader::substituteMIMETypeFromPluginDatabase(const ResourceResponse& r)
 {
-    if (!m_frame->settings()->arePluginsEnabled())
+    if (!m_frame->loader()->client()->allowPlugins(m_frame->settings()->arePluginsEnabled()))
         return;
 
     String filename = r.url().lastPathComponent();
diff --git a/WebCore/loader/PluginDocument.cpp b/WebCore/loader/PluginDocument.cpp
index 788691f..d710746 100644
--- a/WebCore/loader/PluginDocument.cpp
+++ b/WebCore/loader/PluginDocument.cpp
@@ -104,7 +104,7 @@ bool PluginTokenizer::writeRawData(const char*, int)
 
     if (Frame* frame = m_doc->frame()) {
         Settings* settings = frame->settings();
-        if (settings && settings->arePluginsEnabled()) {
+        if (settings && frame->loader()->client()->allowPlugins(settings->arePluginsEnabled())) {
             m_doc->updateLayout();
 
             if (RenderWidget* renderer = toRenderWidget(m_embedElement->renderer())) {
diff --git a/WebCore/page/Page.cpp b/WebCore/page/Page.cpp
index d2ad046..a11b5de 100644
--- a/WebCore/page/Page.cpp
+++ b/WebCore/page/Page.cpp
@@ -389,7 +389,7 @@ void Page::refreshPlugins(bool reload)
 
 PluginData* Page::pluginData() const
 {
-    if (!settings()->arePluginsEnabled())
+    if (!mainFrame()->loader()->client()->allowPlugins(settings()->arePluginsEnabled()))
         return 0;
     if (!m_pluginData)
         m_pluginData = PluginData::create(this);
diff --git a/WebCore/plugins/MimeType.cpp b/WebCore/plugins/MimeType.cpp
index c4b051c..ac9181c 100644
--- a/WebCore/plugins/MimeType.cpp
+++ b/WebCore/plugins/MimeType.cpp
@@ -20,6 +20,7 @@
 #include "MimeType.h"
 
 #include "Frame.h"
+#include "FrameLoaderClient.h"
 #include "Page.h"
 #include "Plugin.h"
 #include "PluginData.h"
@@ -55,7 +56,7 @@ const String &MimeType::description() const
 PassRefPtr<Plugin> MimeType::enabledPlugin() const
 {
     const Page* p = m_pluginData->page();
-    if (!p || !p->settings()->arePluginsEnabled())
+    if (!p || !p->mainFrame()->loader()->client()->allowPlugins(p->settings()->arePluginsEnabled()))
         return 0;
 
     const PluginInfo *info = m_pluginData->mimes()[m_index]->plugin;

-- 
WebKit Debian packaging