Changeset 76415 in webkit

Timestamp:

Jan 21, 2011 5:45:14 PM (13 years ago)

Author:

andreas.kling@nokia.com

Message:

2011-01-21 Andreas Kling <​kling@webkit.org>

Reviewed by Kenneth Rohde Christiansen.

[Qt] Always set composition mode through GraphicsContext
​https://bugs.webkit.org/show_bug.cgi?id=52940

GraphicsContext tracks the current composition mode so we should
never call through to the QPainter directly.

• platform/graphics/GraphicsContext.h:
• platform/graphics/qt/GraphicsContextQt.cpp: (WebCore::toQtCompositionMode): Changed this method to a static inline since it's only used by GraphicsContextQt.cpp now.

• platform/graphics/qt/ImageQt.cpp: (WebCore::Image::drawPattern): (WebCore::BitmapImage::draw):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/GraphicsContext.h (modified) (1 diff)
• platform/graphics/qt/GraphicsContextQt.cpp (modified) (1 diff)
• platform/graphics/qt/ImageQt.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-01-21  Andreas Kling  <kling@webkit.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Always set composition mode through GraphicsContext
+        https://bugs.webkit.org/show_bug.cgi?id=52940
+
+        GraphicsContext tracks the current composition mode so we should
+        never call through to the QPainter directly.
+
+        * platform/graphics/GraphicsContext.h:
+        * platform/graphics/qt/GraphicsContextQt.cpp:
+        (WebCore::toQtCompositionMode): Changed this method to a static inline
+        since it's only used by GraphicsContextQt.cpp now.
+
+        * platform/graphics/qt/ImageQt.cpp:
+        (WebCore::Image::drawPattern):
+        (WebCore::BitmapImage::draw):
+
 2011-01-21  Dan Bernstein  <mitz@apple.com>
 

trunk/Source/WebCore/platform/graphics/GraphicsContext.h

@@ -466 +466 @@
         void pushTransparencyLayerInternal(const QRect &rect, qreal opacity, QPixmap& alphaMask);
         void takeOwnershipOfPlatformContext();
-        static QPainter::CompositionMode toQtCompositionMode(CompositeOperator op);
 #endif
 

trunk/Source/WebCore/platform/graphics/qt/GraphicsContextQt.cpp

@@ -70 +70 @@
 namespace WebCore {
 
-QPainter::CompositionMode GraphicsContext::toQtCompositionMode(CompositeOperator op)
+static inline QPainter::CompositionMode toQtCompositionMode(CompositeOperator op)
 {
     switch (op) {

trunk/Source/WebCore/platform/graphics/qt/ImageQt.cpp

@@ -121 +121 @@
     CompositeOperator previousOperator = ctxt->compositeOperation();
 
-    ctxt->setCompositeOperation(op);
+    ctxt->setCompositeOperation(!pixmap.hasAlpha() && op == CompositeSourceOver ? CompositeCopy : op);
+
     QPainter* p = ctxt->platformContext();
-    if (!pixmap.hasAlpha() && p->compositionMode() == QPainter::CompositionMode_SourceOver)
-        p->setCompositionMode(QPainter::CompositionMode_Source);
-
     QTransform transform(patternTransform);
 
@@ -224 +222 @@
     }
 
-    QPainter* painter(ctxt->platformContext());
-
-    QPainter::CompositionMode compositionMode = GraphicsContext::toQtCompositionMode(op);
-
-    if (!image->hasAlpha() && painter->compositionMode() == QPainter::CompositionMode_SourceOver)
-        compositionMode = QPainter::CompositionMode_Source;
-
-    QPainter::CompositionMode lastCompositionMode = painter->compositionMode();
-    painter->setCompositionMode(compositionMode);
+    CompositeOperator previousOperator = ctxt->compositeOperation();
+    ctxt->setCompositeOperation(!image->hasAlpha() && op == CompositeSourceOver ? CompositeCopy : op);
 
     ContextShadow* shadow = ctxt->contextShadow();
@@ -244 +235 @@
     }
 
-    // Test using example site at
-    // http://www.meyerweb.com/eric/css/edge/complexspiral/demo.html
-    painter->drawPixmap(normalizedDst, *image, normalizedSrc);
-
-    painter->setCompositionMode(lastCompositionMode);
+    ctxt->platformContext()->drawPixmap(normalizedDst, *image, normalizedSrc);
+
+    ctxt->setCompositeOperation(previousOperator);
 
     if (imageObserver())