[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[aestes at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 1124c893bf984b0983bd6ef64ae1450f5cc899ac
Author: aestes at apple.com <aestes at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Sep 20 17:14:31 2010 +0000

    2010-09-20  Andy Estes  <aestes at apple.com>
    
            Reviewed by Darin Adler.
    
            Fix a style issue and add a FIXME to make the AppleConnect plug-in
            workaround dependent on site-specific quirks being enabled, which
            WebKit2 does not yet support in its WebPreferences implementation.
            https://bugs.webkit.org/show_bug.cgi?id=45960
    
            * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
            (WebKit::WebFrameLoaderClient::createPlugin):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67858 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index b4a16cb..a97cda1 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,15 @@
+2010-09-20  Andy Estes  <aestes at apple.com>
+
+        Reviewed by Darin Adler.
+
+        Fix a style issue and add a FIXME to make the AppleConnect plug-in
+        workaround dependent on site-specific quirks being enabled, which
+        WebKit2 does not yet support in its WebPreferences implementation.
+        https://bugs.webkit.org/show_bug.cgi?id=45960
+
+        * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+        (WebKit::WebFrameLoaderClient::createPlugin):
+
 2010-09-20  Sam Weinig  <sam at webkit.org>
 
         Reviewed by Adam Roben.
diff --git a/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp b/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp
index 86ef574..f2a1f17 100644
--- a/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp
+++ b/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp
@@ -990,9 +990,13 @@ PassRefPtr<Widget> WebFrameLoaderClient::createPlugin(const IntSize&, HTMLPlugIn
     // understand the parameter names specified in the <object> element that
     // embeds its plug-in. This hack works around the issue by converting the
     // parameter names to lowercase before passing them to the plug-in.
-    if (equalIgnoringCase(mimeType, "application/x-snkp"))
+    // FIXME: This workaround should be dependent on site-specific quirks being
+    // enabled. This requires adding this setting to WebKit2's WebPreferences
+    // implementation. See <https://bugs.webkit.org/show_bug.cgi?id=46076>.
+    if (equalIgnoringCase(mimeType, "application/x-snkp")) {
         for (size_t i = 0; i < paramNames.size(); ++i)
             parameters.names[i] = paramNames[i].lower();
+    }
 
     RefPtr<Plugin> plugin = NetscapePlugin::create(pluginModule.release());
     return PluginView::create(pluginElement, plugin.release(), parameters);

-- 
WebKit Debian packaging