[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

commit-queue at webkit.org commit-queue at webkit.org
Fri Jan 21 14:44:59 UTC 2011


The following commit has been merged in the debian/experimental branch:
commit 9655648615bb732e13193d0a3c729c02ce5538f4
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 28 22:56:01 2010 +0000

    2010-12-28  Jan Erik Hanssen  <jhanssen at sencha.com>
    
            Reviewed by Eric Seidel.
    
            [Qt] GraphicsContext::getCTM() does not need to make a copy of QPainter::combinedTransform()
            https://bugs.webkit.org/show_bug.cgi?id=51687
    
            Use a const reference instead of a copy of QPainter::combinedTransform()
            in GraphicsContext::getCTM()
    
            * platform/graphics/qt/GraphicsContextQt.cpp:
            (WebCore::GraphicsContext::getCTM):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74728 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 354a835..70dab5b 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-12-28  Jan Erik Hanssen  <jhanssen at sencha.com>
+
+        Reviewed by Eric Seidel.
+
+        [Qt] GraphicsContext::getCTM() does not need to make a copy of QPainter::combinedTransform()
+        https://bugs.webkit.org/show_bug.cgi?id=51687
+
+        Use a const reference instead of a copy of QPainter::combinedTransform() 
+        in GraphicsContext::getCTM()
+
+        * platform/graphics/qt/GraphicsContextQt.cpp:
+        (WebCore::GraphicsContext::getCTM):
+
 2010-12-28  Takashi Toyoshima  <toyoshim at google.com>
 
         Reviewed by Eric Seidel.
diff --git a/WebCore/platform/graphics/qt/GraphicsContextQt.cpp b/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
index 701be00..0cf6f22 100644
--- a/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
+++ b/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
@@ -288,7 +288,7 @@ PlatformGraphicsContext* GraphicsContext::platformContext() const
 
 AffineTransform GraphicsContext::getCTM() const
 {
-    QTransform matrix(platformContext()->combinedTransform());
+    const QTransform& matrix = platformContext()->combinedTransform();
     return AffineTransform(matrix.m11(), matrix.m12(), matrix.m21(),
                            matrix.m22(), matrix.dx(), matrix.dy());
 }

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list