Changeset 63727 in webkit

Timestamp:

Jul 20, 2010 12:07:16 AM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2010-07-20 Matthew Delaney <​mdelaney@apple.com>

Reviewed by Kenneth Rohde Christiansen.

Failing 2d.path.stroke.prune.curve philip canvas test
​https://bugs.webkit.org/show_bug.cgi?id=42190

• platform/mac/Skipped: Unskipped now passing tests.

2010-07-20 Matthew Delaney <​mdelaney@apple.com>

Reviewed by Kenneth Rohde Christiansen.

Failing 2d.path.stroke.prune.curve philip canvas test
​https://bugs.webkit.org/show_bug.cgi?id=42190

• html/canvas/CanvasRenderingContext2D.cpp: (WebCore::CanvasRenderingContext2D::closePath): Added check to make sure there's a non-trivial path to close. Since there is currently no way to check if the current point is the start point, or similarly if there is only 1 point in the current subpath (since these are both sufficient conditions for a trivial subpath), then checking that the bounding rectangle has both zero width and height proves also to be a sufficient condition for a trivial path. (WebCore::CanvasRenderingContext2D::quadraticCurveTo): Added in simple bounds as per the spec. (WebCore::CanvasRenderingContext2D::bezierCurveTo): Added in simple bounds as per the spec.
• platform/graphics/cg/PathCG.cpp: (WebCore::Path::closeSubpath): Moved the check for an empty path up on level to make it platform independent and remove redundancy.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac/Skipped (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/html/canvas/CanvasRenderingContext2D.cpp (modified) (4 diffs)
• WebCore/platform/graphics/cg/PathCG.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-07-20  Matthew Delaney  <mdelaney@apple.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Failing 2d.path.stroke.prune.curve philip canvas test
+        https://bugs.webkit.org/show_bug.cgi?id=42190
+
+        * platform/mac/Skipped: Unskipped now passing tests.
+
 2010-07-19  Maciej Stachowiak  <mjs@apple.com>
 

trunk/LayoutTests/platform/mac/Skipped

@@ -212 +212 @@
 canvas/philip/tests/2d.path.clip.empty.html
 canvas/philip/tests/2d.path.rect.winding.html
-canvas/philip/tests/2d.path.stroke.prune.closed.html
-canvas/philip/tests/2d.path.stroke.prune.curve.html
 canvas/philip/tests/2d.pattern.image.broken.html
 canvas/philip/tests/2d.pattern.image.incomplete.html

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-07-20  Matthew Delaney  <mdelaney@apple.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Failing 2d.path.stroke.prune.curve philip canvas test
+        https://bugs.webkit.org/show_bug.cgi?id=42190
+
+        * html/canvas/CanvasRenderingContext2D.cpp:
+        (WebCore::CanvasRenderingContext2D::closePath): Added check to make sure there's a non-trivial path to close. Since there is currently no way to check if the current point is the start point, or similarly if there is only 1 point in the current subpath (since these are both sufficient conditions for a trivial subpath), then checking that the bounding rectangle has both zero width and height proves also to be a sufficient condition for a trivial path.
+        (WebCore::CanvasRenderingContext2D::quadraticCurveTo): Added in simple bounds as per the spec.
+        (WebCore::CanvasRenderingContext2D::bezierCurveTo): Added in simple bounds as per the spec.
+        * platform/graphics/cg/PathCG.cpp:
+        (WebCore::Path::closeSubpath): Moved the check for an empty path up on level to make it platform independent and remove redundancy.
+
 2010-07-19  Victoria Kirst  <vrk@google.com>
 

trunk/WebCore/html/canvas/CanvasRenderingContext2D.cpp

@@ -558 +558 @@
 void CanvasRenderingContext2D::closePath()
 {
-    m_path.closeSubpath();
+    if (m_path.isEmpty())
+        return;
+
+    FloatRect boundRect = m_path.boundingRect();
+    if (boundRect.width() || boundRect.height())
+        m_path.closeSubpath();
 }
 
@@ -576 +581 @@
     if (!state().m_invertibleCTM)
         return;
-    
+
     FloatPoint p1 = FloatPoint(x, y);
     if (!m_path.hasCurrentPoint())
@@ -592 +597 @@
     if (!m_path.hasCurrentPoint())
         m_path.moveTo(FloatPoint(cpx, cpy));
-    m_path.addQuadCurveTo(FloatPoint(cpx, cpy), FloatPoint(x, y));
+
+    FloatPoint p1 = FloatPoint(x, y);
+    if (p1 != m_path.currentPoint())
+        m_path.addQuadCurveTo(FloatPoint(cpx, cpy), p1);
 }
 
@@ -603 +611 @@
     if (!m_path.hasCurrentPoint())
         m_path.moveTo(FloatPoint(cp1x, cp1y));
-    m_path.addBezierCurveTo(FloatPoint(cp1x, cp1y), FloatPoint(cp2x, cp2y), FloatPoint(x, y));
+
+    FloatPoint p1 = FloatPoint(x, y);
+    if (p1 != m_path.currentPoint())
+        m_path.addBezierCurveTo(FloatPoint(cp1x, cp1y), FloatPoint(cp2x, cp2y), p1);
 }
 

trunk/WebCore/platform/graphics/cg/PathCG.cpp

@@ -214 +214 @@
 void Path::closeSubpath()
 {
-    if (!CGPathIsEmpty(m_path)) // to silence a warning when trying to close an empty path
-        CGPathCloseSubpath(m_path);
+    CGPathCloseSubpath(m_path);
 }