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

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 08bc6f128b82a837b8582f4e2caf9e788f03b3f7
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 8 13:58:11 2010 +0000

    2010-10-08  Hui Huang  <hui.2.huang at nokia.com>
    
            Reviewed by Simon Hausmann.
    
            ifdef out code that rewrites Flash Plug-in wmode for Symbian build
            https://bugs.webkit.org/show_bug.cgi?id=43484
    
            * WebCoreSupport/FrameLoaderClientQt.cpp:
            (WebCore::FrameLoaderClientQt::createPlugin):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69396 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 8d67f3e..c252b7e 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,13 @@
+2010-10-08  Hui Huang  <hui.2.huang at nokia.com>
+
+        Reviewed by Simon Hausmann.
+
+        ifdef out code that rewrites Flash Plug-in wmode for Symbian build
+        https://bugs.webkit.org/show_bug.cgi?id=43484
+
+        * WebCoreSupport/FrameLoaderClientQt.cpp:
+        (WebCore::FrameLoaderClientQt::createPlugin):
+
 2010-10-07  Andreas Kling  <kling at webkit.org>
 
         Reviewed by Simon Hausmann.
diff --git a/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp b/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
index 41bcb3c..2815171 100644
--- a/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
+++ b/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
@@ -1505,6 +1505,7 @@ PassRefPtr<Widget> FrameLoaderClientQt::createPlugin(const IntSize& pluginSize,
     else { // NPAPI Plugins
         Vector<String> params = paramNames;
         Vector<String> values = paramValues;
+#if !OS(SYMBIAN)
         if (mimeType == "application/x-shockwave-flash") {
             QWebPageClient* client = m_webFrame->page()->d->client;
             const bool isQWebView = client && qobject_cast<QWidget*>(client->pluginParent());
@@ -1530,6 +1531,7 @@ PassRefPtr<Widget> FrameLoaderClientQt::createPlugin(const IntSize& pluginSize,
             }
 #endif
         }
+#endif
 
         RefPtr<PluginView> pluginView = PluginView::create(m_frame, pluginSize, element, url,
             params, values, mimeType, loadManually);

-- 
WebKit Debian packaging