[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da

[andreas.kling at nokia.com]

The following commit has been merged in the debian/experimental branch:
commit fb33df8b2f7a0d9c7a0d4ef5d9347451983fc57f
Author: andreas.kling at nokia.com <andreas.kling at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 16 01:15:46 2010 +0000

    2010-12-15  Andreas Kling  <andreas.kling at 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):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74165 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 6016df5..eebf8a3 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-12-15  Andreas Kling  <andreas.kling at 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 at rim.com>
 
         Reviewed by Darin Adler.
diff --git a/WebCore/platform/graphics/qt/StillImageQt.cpp b/WebCore/platform/graphics/qt/StillImageQt.cpp
index f1e5dcd..51c9499 100644
--- a/WebCore/platform/graphics/qt/StillImageQt.cpp
+++ b/WebCore/platform/graphics/qt/StillImageQt.cpp
@@ -71,11 +71,11 @@ void StillImage::draw(GraphicsContext* ctxt, const FloatRect& dst,
     FloatRect normalizedSrc = src.normalized();
     FloatRect normalizedDst = dst.normalized();
 
-    QPainter* painter = ctxt->platformContext();
-    QPainter::CompositionMode oldCompositionMode = painter->compositionMode();
-
+    CompositeOperator previousOperator = ctxt->compositeOperation();
     ctxt->setCompositeOperation(op);
 
+    QPainter* painter = ctxt->platformContext();
+
     ContextShadow* shadow = ctxt->contextShadow();
     if (shadow->m_type != ContextShadow::NoShadow) {
         QPainter* shadowPainter = shadow->beginShadowLayer(painter, normalizedDst);
@@ -87,7 +87,7 @@ void StillImage::draw(GraphicsContext* ctxt, const FloatRect& dst,
     }
 
     painter->drawPixmap(normalizedDst, *m_pixmap, normalizedSrc);
-    painter->setCompositionMode(oldCompositionMode);
+    ctxt->setCompositeOperation(previousOperator);
 }
 
 }

-- 
WebKit Debian packaging