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

[andreas.kling at nokia.com]

The following commit has been merged in the debian/experimental branch:
commit 81153d009ead94b894928f2d3b99dbd7fd814f0b
Author: andreas.kling at nokia.com <andreas.kling at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jul 26 15:56:50 2010 +0000

    2010-07-26  Andreas Kling  <andreas.kling at nokia.com>
    
            Reviewed by Tor Arne Vestbø.
    
            [Qt] Canvas: Optimize GraphicsContext::addPath()
    
            Avoid "deep concatenating" the canvas path onto the GC path
            if the GC path has no elements.
    
            * platform/graphics/qt/GraphicsContextQt.cpp:
            (WebCore::GraphicsContext::addPath):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64047 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 9ba9840..1a90245 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-07-26  Andreas Kling  <andreas.kling at nokia.com>
+
+        Reviewed by Tor Arne Vestbø.
+
+        [Qt] Canvas: Optimize GraphicsContext::addPath()
+
+        Avoid "deep concatenating" the canvas path onto the GC path
+        if the GC path has no elements.
+
+        * platform/graphics/qt/GraphicsContextQt.cpp:
+        (WebCore::GraphicsContext::addPath):
+
 2010-07-23  Stephen White  <senorblanco at chromium.org>
 
         Reviewed by Darin Fisher.
diff --git a/WebCore/platform/graphics/qt/GraphicsContextQt.cpp b/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
index a0cc0a7..e560e15 100644
--- a/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
+++ b/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
@@ -793,9 +793,11 @@ void GraphicsContext::beginPath()
 
 void GraphicsContext::addPath(const Path& path)
 {
-    QPainterPath newPath = m_data->currentPath;
-    newPath.addPath(path.platformPath());
-    m_data->currentPath = newPath;
+    if (!m_data->currentPath.elementCount()) {
+        m_data->currentPath = path.platformPath();
+        return;
+    }
+    m_data->currentPath.addPath(path.platformPath());
 }
 
 bool GraphicsContext::inTransparencyLayer() const

-- 
WebKit Debian packaging