Changeset 65796 in webkit

Timestamp:

Aug 23, 2010 1:10:30 AM (14 years ago)

Author:

Girish Ramakrishnan

Message:

[Qt] Allow wmode=transparent in QWebView on Maemo5 after r65775.

​https://bugs.webkit.org/show_bug.cgi?id=44043

Reviewed by Ariya Hidayat.

• WebCoreSupport/FrameLoaderClientQt.cpp:

(WebCore::FrameLoaderClientQt::createPlugin):

Location:

trunk/WebKit/qt

Files:

• ChangeLog (modified) (1 diff)
• WebCoreSupport/FrameLoaderClientQt.cpp (modified) (3 diffs)

trunk/WebKit/qt/ChangeLog

@@ +1 @@
+2010-08-20  Girish Ramakrishnan  <girish@forwardbias.in>
+
+        Reviewed by Ariya Hidayat.
+
+        [Qt] Allow wmode=transparent in QWebView on Maemo5 after r65775.
+        
+        https://bugs.webkit.org/show_bug.cgi?id=44043
+
+        * WebCoreSupport/FrameLoaderClientQt.cpp:
+        (WebCore::FrameLoaderClientQt::createPlugin):
+
 2010-08-22  Marc Mutz  <marc.mutz@kdab.com>
 

trunk/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp

@@ -5 +5 @@
  * Copyright (C) 2008 Collabora Ltd. All rights reserved.
  * Coypright (C) 2008 Holger Hans Peter Freyther
- * Coypright (C) 2009 Girish Ramakrishnan <girish@forwardbias.in>
+ * Coypright (C) 2009, 2010 Girish Ramakrishnan <girish@forwardbias.in>
  *
  * All rights reserved.
@@ -1464 +1464 @@
         if (mimeType == "application/x-shockwave-flash") {
             QWebPageClient* client = m_webFrame->page()->d->client;
+            const bool isQWebView = client && qobject_cast<QWidget*>(client->pluginParent());
 #if defined(MOZ_PLATFORM_MAEMO) && (MOZ_PLATFORM_MAEMO == 5)
-            if (true) {
+            size_t wmodeIndex = params.find("wmode");
+            if (wmodeIndex == -1) {
+                // Disable XEmbed mode and force it to opaque mode
+                params.append("wmode");
+                values.append("opaque");
+            } else if (!isQWebView) {
+                // Disable transparency if client is not a QWebView
+                values[wmodeIndex] = "opaque";
+            }
 #else
-            if (!client || !qobject_cast<QWidget*>(client->pluginParent())) {
-#endif
+            if (!isQWebView) {
                 // inject wmode=opaque when there is no client or the client is not a QWebView
                 size_t wmodeIndex = params.find("wmode");
@@ -1477 +1485 @@
                     values[wmodeIndex] = "opaque";
             }
+#endif
         }