Changeset 49169 in webkit

Timestamp:

Oct 6, 2009 4:52:42 AM (15 years ago)

Author:

Simon Hausmann

Message:

[Qt] Windowless plugins: Add PluginQuirkRequiresDefaultScreenDepth quirk for Flash.

Patch by Girish Ramakrishnan <Girish Ramakrishnan> on 2009-10-06
Reviewed by Simon Hausmann.

Flash does not use the visual provided by us to draw into the drawable.
It instead uses the system default visual (as returned by XDefaultVisual).
This means that if the screen default visual is 24-bit, Flash won't be
able to draw on 32-bit drawable created by us. This is a bug in Flash
and for the moment, the above quirk is only set for Flash.

Our strategy to create the drawable:

1. Create a 32-bit drawable if the default screen depth is 32 or the

quirk is not set (i.e not flash)

2. If we didn't create a 32-bit drawable (maybe the Display has no such

visual), we create a drawable with default screen depth.

As a result of the above changes, content propagation behavior changes as:

1. Content propagation is possible only if the drawable we create and

Qt's backing store are of the same depth.

2. If we created a 32-bit drawable, there is no need for content

propagation (Qt will take care of it).

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

• plugins/PluginPackage.cpp:

(WebCore::PluginPackage::determineQuirks):

• plugins/PluginQuirkSet.h:

(WebCore::):

• plugins/PluginView.cpp:

(WebCore::PluginView::PluginView):

• plugins/PluginView.h:
• plugins/qt/PluginViewQt.cpp:

(WebCore::PluginView::updatePluginWidget):
(WebCore::PluginView::paint):
(WebCore::getVisualAndColormap):
(WebCore::PluginView::platformStart):
(WebCore::PluginView::platformDestroy):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• plugins/PluginPackage.cpp (modified) (1 diff)
• plugins/PluginQuirkSet.h (modified) (1 diff)
• plugins/PluginView.cpp (modified) (1 diff)
• plugins/PluginView.h (modified) (1 diff)
• plugins/qt/PluginViewQt.cpp (modified) (8 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-10-06  Girish Ramakrishnan  <girish@forwardbias.in>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Windowless plugins: Add PluginQuirkRequiresDefaultScreenDepth quirk for Flash.
+
+        Flash does not use the visual provided by us to draw into the drawable.
+        It instead uses the system default visual (as returned by XDefaultVisual).
+        This means that if the screen default visual is 24-bit, Flash won't be
+        able to draw on 32-bit drawable created by us. This is a bug in Flash
+        and for the moment, the above quirk is only set for Flash.
+
+        Our strategy to create the drawable:
+        1. Create a 32-bit drawable if the default screen depth is 32 or the
+        quirk is not set (i.e not flash)
+        2. If we didn't create a 32-bit drawable (maybe the Display has no such
+        visual), we create a drawable with default screen depth.
+
+        As a result of the above changes, content propagation behavior changes as:
+        1. Content propagation is possible only if the drawable we create and
+        Qt's backing store are of the same depth.
+        2. If we created a 32-bit drawable, there is no need for content
+        propagation (Qt will take care of it).
+
+        https://bugs.webkit.org/show_bug.cgi?id=20081
+
+        * plugins/PluginPackage.cpp:
+        (WebCore::PluginPackage::determineQuirks):
+        * plugins/PluginQuirkSet.h:
+        (WebCore::):
+        * plugins/PluginView.cpp:
+        (WebCore::PluginView::PluginView):
+        * plugins/PluginView.h:
+        * plugins/qt/PluginViewQt.cpp:
+        (WebCore::PluginView::updatePluginWidget):
+        (WebCore::PluginView::paint):
+        (WebCore::getVisualAndColormap):
+        (WebCore::PluginView::platformStart):
+        (WebCore::PluginView::platformDestroy):
+
 2009-10-06  Fumitoshi Ukai  <ukai@chromium.org>
 

trunk/WebCore/plugins/PluginPackage.cpp

@@ -184 +184 @@
             m_quirks.add(PluginQuirkRequiresGtkToolKit);
 #endif
+            m_quirks.add(PluginQuirkRequiresDefaultScreenDepth);
         } else {
             // Flash 9 and older requests windowless plugins if we return a mozilla user agent

trunk/WebCore/plugins/PluginQuirkSet.h

@@ -47 +47 @@
         PluginQuirkDontAllowMultipleInstances = 1 << 11,
         PluginQuirkRequiresGtkToolKit = 1 << 12,
+        PluginQuirkRequiresDefaultScreenDepth = 1 << 13
     };
 

trunk/WebCore/plugins/PluginView.cpp

@@ -822 +822 @@
     , m_hasPendingGeometryChange(false)
     , m_drawable(0)
+    , m_visual(0)
+    , m_colormap(0)
     , m_pluginDisplay(0)
 #endif

trunk/WebCore/plugins/PluginView.h

@@ -328 +328 @@
         bool m_hasPendingGeometryChange;
         Pixmap m_drawable;
+        Visual* m_visual;
+        Colormap m_colormap;
         Display* m_pluginDisplay;
 

trunk/WebCore/plugins/qt/PluginViewQt.cpp

@@ -69 +69 @@
 #include <runtime/JSValue.h>
 #include <X11/X.h>
+#ifndef QT_NO_XRENDER
+#define Bool int
+#define Status int
+#include <X11/extensions/Xrender.h>
+#endif
 
 using JSC::ExecState;
@@ -106 +111 @@
 
     if (!m_isWindowed)
-        m_drawable = XCreatePixmap(QX11Info::display(), QX11Info::appRootWindow(), m_windowRect.width(), m_windowRect.height(), QX11Info::appDepth());
+        m_drawable = XCreatePixmap(QX11Info::display(), QX11Info::appRootWindow(), m_windowRect.width(), m_windowRect.height(), 
+                                   ((NPSetWindowCallbackStruct*)m_npWindow.ws_info)->depth);
 
     // do not call setNPWindowIfNeeded immediately, will be called on paint()
@@ -175 +181 @@
 
     QPixmap qtDrawable = QPixmap::fromX11Pixmap(m_drawable, QPixmap::ExplicitlyShared);
-
-    if (m_isTransparent) {
-        // Attempt content propagation by copying over from the backing store
+    const int drawableDepth = ((NPSetWindowCallbackStruct*)m_npWindow.ws_info)->depth;
+    ASSERT(drawableDepth == qtDrawable.depth());
+
+    if (m_isTransparent && drawableDepth != 32) {
+        // Attempt content propagation for drawable with no alpha by copying over from the backing store
         QPoint offset;
         QPaintDevice* backingStoreDevice =  QPainter::redirected(painter->device(), &offset);
+        offset = -offset; // negating the offset gives us the offset of the view within the backing store pixmap
+
         const bool hasValidBackingStore = backingStoreDevice && backingStoreDevice->devType() == QInternal::Pixmap;
-        offset = -offset; // negating the offset gives us the offset of the view within the backing store pixmap
-
-        if (hasValidBackingStore) {
-            QPixmap* backingStorePixmap = static_cast<QPixmap*>(backingStoreDevice);
+        QPixmap* backingStorePixmap = static_cast<QPixmap*>(backingStoreDevice);
+
+        if (hasValidBackingStore && backingStorePixmap->depth() == drawableDepth) {
             GC gc = XDefaultGC(QX11Info::display(), QX11Info::appScreen());
             XCopyArea(QX11Info::display(), backingStorePixmap->handle(), m_drawable, gc,
                 offset.x() + m_windowRect.x() + m_clipRect.x(), offset.y() + m_windowRect.y() + m_clipRect.y(),
                 m_clipRect.width(), m_clipRect.height(), m_clipRect.x(), m_clipRect.y());
-        } else { // no backing store, clean the pixmap
+        } else { // no backing store, clean the pixmap because the plugin thinks its transparent
             QPainter painter(&qtDrawable);
             painter.fillRect(m_clipRect, Qt::white);
@@ -683 +692 @@
 }
 
+static void getVisualAndColormap(int depth, Visual **visual, Colormap *colormap)
+{
+    *visual = 0;
+    *colormap = 0;
+
+#ifndef QT_NO_XRENDER
+    static const bool useXRender = qgetenv("QT_X11_NO_XRENDER").isNull(); // Should also check for XRender >= 0.5
+#else
+    static const bool useXRender = false;
+#endif
+
+    if (!useXRender && depth == 32)
+        return;
+
+    int nvi;
+    XVisualInfo templ;
+    templ.screen  = QX11Info::appScreen();
+    templ.depth   = depth;
+    templ.c_class = TrueColor;
+    XVisualInfo* xvi = XGetVisualInfo(QX11Info::display(), VisualScreenMask | VisualDepthMask | VisualClassMask, &templ, &nvi);
+
+    if (!xvi)
+        return;
+
+#ifndef QT_NO_XRENDER
+    if (depth == 32) {
+        for (int idx = 0; idx < nvi; ++idx) {
+            XRenderPictFormat* format = XRenderFindVisualFormat(QX11Info::display(), xvi[idx].visual);
+            if (format->type == PictTypeDirect && format->direct.alphaMask) {
+                 *visual = xvi[idx].visual;
+                 break;
+            }
+         }
+    } else
+#endif // QT_NO_XRENDER
+        *visual = xvi[0].visual;
+
+    XFree(xvi);
+
+    if (*visual)
+        *colormap = XCreateColormap(QX11Info::display(), QX11Info::appRootWindow(), *visual, AllocNone);
+}
+
 bool PluginView::platformStart()
 {
@@ -716 +768 @@
     wsi->type = 0;
 
-    const QX11Info* x11Info = 0;
     if (m_isWindowed) {
-        x11Info = &platformPluginWidget()->x11Info();
+        const QX11Info* x11Info = &platformPluginWidget()->x11Info();
+
+        wsi->display = x11Info->display();
+        wsi->visual = (Visual*)x11Info->visual();
+        wsi->depth = x11Info->depth();
+        wsi->colormap = x11Info->colormap();
 
         m_npWindow.type = NPWindowTypeWindow;
@@ -725 +781 @@
         m_npWindow.height = -1;
     } else {
-        x11Info = &QApplication::desktop()->x11Info();
+        const QX11Info* x11Info = &QApplication::desktop()->x11Info();
+
+        if (x11Info->depth() == 32 || !m_plugin->quirks().contains(PluginQuirkRequiresDefaultScreenDepth)) {
+            getVisualAndColormap(32, &m_visual, &m_colormap);
+            wsi->depth = 32;
+        }
+
+        if (!m_visual) {
+            getVisualAndColormap(x11Info->depth(), &m_visual, &m_colormap);
+            wsi->depth = x11Info->depth();
+        }
+
+        wsi->display = x11Info->display();
+        wsi->visual = m_visual;
+        wsi->colormap = m_colormap;
 
         m_npWindow.type = NPWindowTypeDrawable;
@@ -735 +805 @@
     }
 
-    wsi->display = x11Info->display();
-    wsi->visual = (Visual*)x11Info->visual();
-    wsi->depth = x11Info->depth();
-    wsi->colormap = x11Info->colormap();
     m_npWindow.ws_info = wsi;
 
@@ -756 +822 @@
     if (m_drawable)
         XFreePixmap(QX11Info::display(), m_drawable);
+
+    if (m_colormap)
+        XFreeColormap(QX11Info::display(), m_colormap);
 }