[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 e18590554bdd714219f4df9cb0a63e086b86b1b3
Author: andreas.kling at nokia.com <andreas.kling at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Jul 17 04:53:46 2010 +0000

    2010-07-16  Andreas Kling  <andreas.kling at nokia.com>
    
            Reviewed by Sam Weinig.
    
            Failing 2d.path.arcTo.ensuresubpath.* philip canvas tests
            https://bugs.webkit.org/show_bug.cgi?id=42186
    
            Unskip tests:
            - canvas/philip/tests/2d.path.arcTo.ensuresubpath.1.html
            - canvas/philip/tests/2d.path.arcTo.ensuresubpath.2.html
    
            * platform/mac/Skipped:
    2010-07-16  Andreas Kling  <andreas.kling at nokia.com>
    
            Reviewed by Sam Weinig.
    
            Failing 2d.path.arcTo.ensuresubpath.* philip canvas tests
            https://bugs.webkit.org/show_bug.cgi?id=42186
    
            Move code from Qt's Path::addArcTo() up to CanvasRenderingContext2D.
    
            * html/canvas/CanvasRenderingContext2D.cpp:
            (WebCore::CanvasRenderingContext2D::arcTo): Behave as moveTo(x1,y1)
            if the current path is empty.
            * platform/graphics/qt/PathQt.cpp:
            (WebCore::Path::addArcTo): Remove now-redundant code.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63607 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 74311b6..179f971 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,16 @@
+2010-07-16  Andreas Kling  <andreas.kling at nokia.com>
+
+        Reviewed by Sam Weinig.
+
+        Failing 2d.path.arcTo.ensuresubpath.* philip canvas tests
+        https://bugs.webkit.org/show_bug.cgi?id=42186
+
+        Unskip tests:
+        - canvas/philip/tests/2d.path.arcTo.ensuresubpath.1.html
+        - canvas/philip/tests/2d.path.arcTo.ensuresubpath.2.html
+
+        * platform/mac/Skipped:
+
 2010-07-16  Nico Weber  <thakis at chromium.org>
 
         Reviewed by Ojan Vafai.
diff --git a/LayoutTests/platform/mac/Skipped b/LayoutTests/platform/mac/Skipped
index 9e83653..996ed3c 100644
--- a/LayoutTests/platform/mac/Skipped
+++ b/LayoutTests/platform/mac/Skipped
@@ -164,8 +164,6 @@ scrollbars/scrollbar-click-does-not-blur-content.html
 
 # Failing canvas test cases from http://philip.html5.org/tests/canvas/suite/tests/
 canvas/philip/tests/2d.drawImage.broken.html
-canvas/philip/tests/2d.path.arcTo.ensuresubpath.1.html
-canvas/philip/tests/2d.path.arcTo.ensuresubpath.2.html
 canvas/philip/tests/2d.path.clip.empty.html
 canvas/philip/tests/2d.clearRect.shadow.html
 canvas/philip/tests/2d.composite.operation.clear.html
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 55667eb..ca092dd 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,20 @@
 2010-07-16  Andreas Kling  <andreas.kling at nokia.com>
 
+        Reviewed by Sam Weinig.
+
+        Failing 2d.path.arcTo.ensuresubpath.* philip canvas tests
+        https://bugs.webkit.org/show_bug.cgi?id=42186
+
+        Move code from Qt's Path::addArcTo() up to CanvasRenderingContext2D.
+
+        * html/canvas/CanvasRenderingContext2D.cpp:
+        (WebCore::CanvasRenderingContext2D::arcTo): Behave as moveTo(x1,y1)
+        if the current path is empty.
+        * platform/graphics/qt/PathQt.cpp:
+        (WebCore::Path::addArcTo): Remove now-redundant code.
+
+2010-07-16  Andreas Kling  <andreas.kling at nokia.com>
+
         Reviewed by Oliver Hunt.
 
         QtWebkit creates an unnecessary deep copy of images when canvas drawing is done
diff --git a/WebCore/html/canvas/CanvasRenderingContext2D.cpp b/WebCore/html/canvas/CanvasRenderingContext2D.cpp
index 8827678..70c6f63 100644
--- a/WebCore/html/canvas/CanvasRenderingContext2D.cpp
+++ b/WebCore/html/canvas/CanvasRenderingContext2D.cpp
@@ -621,8 +621,10 @@ void CanvasRenderingContext2D::arcTo(float x1, float y1, float x2, float y2, flo
     
     FloatPoint p1 = FloatPoint(x1, y1);
     FloatPoint p2 = FloatPoint(x2, y2);
-    
-    if (p1 == m_path.currentPoint() || p1 == p2 || !r)
+
+    if (!m_path.hasCurrentPoint())
+        m_path.moveTo(p1);
+    else if (p1 == m_path.currentPoint() || p1 == p2 || !r)
         lineTo(x1, y1);
     else
         m_path.addArcTo(p1, p2, r);
diff --git a/WebCore/platform/graphics/qt/PathQt.cpp b/WebCore/platform/graphics/qt/PathQt.cpp
index cbcf6ca..a8adb31 100644
--- a/WebCore/platform/graphics/qt/PathQt.cpp
+++ b/WebCore/platform/graphics/qt/PathQt.cpp
@@ -198,15 +198,6 @@ void Path::addBezierCurveTo(const FloatPoint& cp1, const FloatPoint& cp2, const
 
 void Path::addArcTo(const FloatPoint& p1, const FloatPoint& p2, float radius)
 {
-    // Make sure there is a subpath for p1, the behavior depend on the last element of the subpath.
-    // When the user agent is to ensure there is a subpath  for a coordinate (x, y), the user agent must 
-    // check to see if the context has any subpaths, and if it does not, then the user agent must create 
-    // a new subpath with the point (x, y) as its first (and only) point, as if the moveTo()  method had been called.
-    if (!m_path.elementCount()) {
-        m_path.moveTo(p1);
-        return;
-    }
-
     FloatPoint p0(m_path.currentPosition());
 
     FloatPoint p1p0((p0.x() - p1.x()), (p0.y() - p1.y()));

-- 
WebKit Debian packaging