[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

andreas.kling at nokia.com andreas.kling at nokia.com
Sun Feb 20 23:53:27 UTC 2011


The following commit has been merged in the webkit-1.3 branch:
commit d8ddce4f28799d89593dd74ea353c6679758fb60
Author: andreas.kling at nokia.com <andreas.kling at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 26 14:09:50 2011 +0000

    2011-01-26  Zalan Bujtas <zbujtas at gmail.com>
    
            Reviewed by Andreas Kling.
    
            [Qt] Path::normalAngleAtLength() returns incorrect value on ACID3.
    
            QPainterPath returns angle values with the origo being at the top left corner,
            we need to account for this in normalAngleAtLength().
            This Regressed with r66979.
    
            No new tests as this is already covered by ACID3.
    
            * platform/graphics/qt/PathQt.cpp:
            (WebCore::Path::normalAngleAtLength):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76686 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index b7d088b..e704760 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2011-01-26  Zalan Bujtas <zbujtas at gmail.com>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] Path::normalAngleAtLength() returns incorrect value on ACID3.
+
+        QPainterPath returns angle values with the origo being at the top left corner,
+        we need to account for this in normalAngleAtLength().
+        This Regressed with r66979.
+
+        No new tests as this is already covered by ACID3.
+
+        * platform/graphics/qt/PathQt.cpp:
+        (WebCore::Path::normalAngleAtLength):
+
 2011-01-26  Pavel Feldman  <pfeldman at chromium.org>
 
         Reviewed by Yury Semikhatsky.
diff --git a/Source/WebCore/platform/graphics/qt/PathQt.cpp b/Source/WebCore/platform/graphics/qt/PathQt.cpp
index 37413d8..ad482f7 100644
--- a/Source/WebCore/platform/graphics/qt/PathQt.cpp
+++ b/Source/WebCore/platform/graphics/qt/PathQt.cpp
@@ -431,6 +431,14 @@ float Path::normalAngleAtLength(float length, bool& ok)
     qreal percent = m_path.percentAtLength(length);
     qreal angle = m_path.angleAtPercent(percent);
 
+    // Normalize angle value.
+    // QPainterPath returns angle values with the origo being at the top left corner.
+    // In case of moveTo(0, 0) and addLineTo(0, 10) the angle is 270,
+    // while the caller expects it to be 90.
+    // Normalize the value by mirroring it to the x-axis.
+    // For more info look at pathLengthApplierFunction().
+    if (angle > 0)
+        angle = 360 - angle;
     return angle;
 }
 

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list