Changeset 74165 in webkit

Timestamp:

Dec 15, 2010 5:15:46 PM (13 years ago)

Author:

andreas.kling@nokia.com

Message:

2010-12-15 Andreas Kling <​andreas.kling@nokia.com>

Reviewed by Ariya Hidayat.

[Qt] StillImage::draw() shouldn't call setCompositionMode() unless the QPaintEngine has Porter-Duff composition
​https://bugs.webkit.org/show_bug.cgi?id=49918

Go through GraphicsContext::setCompositeOperation() which does the check for us.

• platform/graphics/qt/StillImageQt.cpp: (WebCore::StillImage::draw):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/qt/StillImageQt.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-12-15  Andreas Kling  <andreas.kling@nokia.com>
+
+        Reviewed by Ariya Hidayat.
+
+        [Qt] StillImage::draw() shouldn't call setCompositionMode() unless the QPaintEngine has Porter-Duff composition
+        https://bugs.webkit.org/show_bug.cgi?id=49918
+
+        Go through GraphicsContext::setCompositeOperation() which does the check for us.
+
+        * platform/graphics/qt/StillImageQt.cpp:
+        (WebCore::StillImage::draw):
+
 2010-12-15  Yong Li  <yoli@rim.com>
 

trunk/WebCore/platform/graphics/qt/StillImageQt.cpp

@@ -72 +72 @@
     FloatRect normalizedDst = dst.normalized();
 
+    CompositeOperator previousOperator = ctxt->compositeOperation();
+    ctxt->setCompositeOperation(op);
+
     QPainter* painter = ctxt->platformContext();
-    QPainter::CompositionMode oldCompositionMode = painter->compositionMode();
-
-    ctxt->setCompositeOperation(op);
 
     ContextShadow* shadow = ctxt->contextShadow();
@@ -88 +88 @@
 
     painter->drawPixmap(normalizedDst, *m_pixmap, normalizedSrc);
-    painter->setCompositionMode(oldCompositionMode);
+    ctxt->setCompositeOperation(previousOperator);
 }