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

andreas.kling at nokia.com andreas.kling at nokia.com
Wed Dec 22 14:28:02 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 48926d6786ddb86ee0928c29b38c2ace8ee03e10
Author: andreas.kling at nokia.com <andreas.kling at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Oct 9 23:56:31 2010 +0000

    2010-10-09  Andreas Kling  <kling at webkit.org>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            [Qt] Fast-path in Path::clear() for already empty paths
            https://bugs.webkit.org/show_bug.cgi?id=47460
    
            The only way to clear a QPainterPath is to assign QPainterPath() to it.
            Avoid creating a temporary object etc if the path is already empty.
    
            * platform/graphics/qt/PathQt.cpp:
            (WebCore::Path::clear):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69462 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 4dd8c11..3280b72 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-10-09  Andreas Kling  <kling at webkit.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Fast-path in Path::clear() for already empty paths
+        https://bugs.webkit.org/show_bug.cgi?id=47460
+
+        The only way to clear a QPainterPath is to assign QPainterPath() to it.
+        Avoid creating a temporary object etc if the path is already empty.
+
+        * platform/graphics/qt/PathQt.cpp:
+        (WebCore::Path::clear):
+
 2010-10-08  Ryosuke Niwa  <rniwa at webkit.org>
 
         Reviewed by Darin Adler.
diff --git a/WebCore/platform/graphics/qt/PathQt.cpp b/WebCore/platform/graphics/qt/PathQt.cpp
index b8b9d5e..1c441d5 100644
--- a/WebCore/platform/graphics/qt/PathQt.cpp
+++ b/WebCore/platform/graphics/qt/PathQt.cpp
@@ -335,6 +335,8 @@ void Path::addEllipse(const FloatRect& r)
 
 void Path::clear()
 {
+    if (!m_path.elementCount())
+        return;
     m_path = QPainterPath();
 }
 

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list