Changeset 50123 in webkit

Timestamp:

Oct 26, 2009 7:50:04 PM (15 years ago)

Author:

eric@webkit.org

Message:

2009-10-26 Girish Ramakrishnan <Girish Ramakrishnan>

Reviewed by Antti Koivisto.

[Qt] Windowless Plugins : Print preview shows only part of flash when view is scrolled

When printing, QPrinter's preview mode uses a QPicture to capture the output. The
QPicture holds a reference to the X Pixmap. As a result, the print preview would
update itself when the X Pixmap changes. To prevent the print preview from updating
whenever m_drawable is updated (i.e when the view updates), we create a copy.

We require that a QPixmap::copy() result in a QPixmap backed by a XPixmap
regardless of the graphicssystem. This is taken care of by
commit d310f7c710ecb331a9689861f0551eabd38e946e in Qt (4.6)

The beauty of this patch is that the newly created X Pixmap is managed by Qt and
it will free the Pixmap whenever the user closes the print preview dialog and
handles the case of displaying multiple preview dialogs nicely.

All credit to Samuel Rødal for suggesting usage of QPixmap::copy().

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

• plugins/qt/PluginViewQt.cpp: (WebCore::PluginView::paint):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• plugins/qt/PluginViewQt.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-10-26  Girish Ramakrishnan  <girish@forwardbias.in>
+
+        Reviewed by Antti Koivisto.
+
+        [Qt] Windowless Plugins : Print preview shows only part of flash when view is scrolled
+        
+        When printing, QPrinter's preview mode uses a QPicture to capture the output. The
+        QPicture holds a reference to the X Pixmap. As a result, the print preview would
+        update itself when the X Pixmap changes. To prevent the print preview from updating
+        whenever m_drawable is updated (i.e when the view updates), we create a copy.
+        
+        We require that a QPixmap::copy() result in a QPixmap backed by a XPixmap
+        regardless of the graphicssystem. This is taken care of by
+        commit d310f7c710ecb331a9689861f0551eabd38e946e in Qt (4.6)
+        
+        The beauty of this patch is that the newly created X Pixmap is managed by Qt and
+        it will free the Pixmap whenever the user closes the print preview dialog and
+        handles the case of displaying multiple preview dialogs nicely.
+        
+        All credit to Samuel Rødal for suggesting usage of QPixmap::copy().
+        
+        https://bugs.webkit.org/show_bug.cgi?id=30714
+
+        * plugins/qt/PluginViewQt.cpp:
+        (WebCore::PluginView::paint):
+
 2009-10-26  Benjamin Otte  <otte@gnome.org>
 

trunk/WebCore/plugins/qt/PluginViewQt.cpp

@@ -187 +187 @@
     ASSERT(drawableDepth == qtDrawable.depth());
 
+    // When printing, Qt uses a QPicture the capture the output in preview mode. The
+    // QPicture holds a reference to the X Pixmap. As a result, the print preview would
+    // update itself when the X Pixmap changes. To prevent this, we create a copy.
+    if (m_element->document()->printing())
+        qtDrawable = qtDrawable.copy();
+
     if (m_isTransparent && drawableDepth != 32) {
         // Attempt content propagation for drawable with no alpha by copying over from the backing store
@@ -222 +228 @@
     exposeEvent.type = GraphicsExpose;
     exposeEvent.display = QX11Info::display();
-    exposeEvent.drawable = m_drawable;
+    exposeEvent.drawable = qtDrawable.handle();
     exposeEvent.x = exposedRect.x();
     exposeEvent.y = exposedRect.y();