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

[girish at forwardbias.in]

The following commit has been merged in the debian/experimental branch:
commit dc6170b7c774877cc0c5a66ed772bcc2a2c99c8b
Author: girish at forwardbias.in <girish at forwardbias.in@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Aug 19 14:47:23 2010 +0000

    [Qt] Inject wmode=opaque for both QWebView and QGraphicsWebView on Maemo5
    as Flash XEmbed support is flaky.
    
    https://bugs.webkit.org/show_bug.cgi?id=44043
    
    Reviewed by Kenneth Christiansen.
    
    * WebCoreSupport/FrameLoaderClientQt.cpp:
    (WebCore::FrameLoaderClientQt::createPlugin):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65668 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 9d2af92..2cdc22a 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,15 @@
+2010-08-19  Girish Ramakrishnan  <girish at forwardbias.in>
+
+        Reviewed by Kenneth Christiansen.
+
+        [Qt] Inject wmode=opaque for both QWebView and QGraphicsWebView on Maemo5
+        as Flash XEmbed support is flaky.
+
+        https://bugs.webkit.org/show_bug.cgi?id=44043
+
+        * WebCoreSupport/FrameLoaderClientQt.cpp:
+        (WebCore::FrameLoaderClientQt::createPlugin):
+
 2010-08-18  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
 
         Unreviewed, trivial Symbian build fix.
diff --git a/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp b/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
index 1dd9f21..a877d48 100644
--- a/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
+++ b/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
@@ -1461,7 +1461,11 @@ PassRefPtr<Widget> FrameLoaderClientQt::createPlugin(const IntSize& pluginSize,
         Vector<String> values = paramValues;
         if (mimeType == "application/x-shockwave-flash") {
             QWebPageClient* client = m_webFrame->page()->d->client;
+#if defined(MOZ_PLATFORM_MAEMO) && (MOZ_PLATFORM_MAEMO == 5)
+            if (true) {
+#else
             if (!client || !qobject_cast<QWidget*>(client->pluginParent())) {
+#endif
                 // inject wmode=opaque when there is no client or the client is not a QWebView
                 size_t wmodeIndex = params.find("wmode");
                 if (wmodeIndex == -1) {

-- 
WebKit Debian packaging