Changeset 24480 in webkit

Timestamp:

Jul 20, 2007 9:35:57 AM (17 years ago)

Author:

rwlbuis

Message:

Reviewed by Darin.

​http://bugs.webkit.org/show_bug.cgi?id=14642
REGRESSION(r24064-24096): Reflection type effect in canvas tag broke

Do not stop the fill/stroke operation when encountering an empty path.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/canvas/gradient-empty-path-expected.checksum (added)
• LayoutTests/fast/canvas/gradient-empty-path-expected.png (added)
• LayoutTests/fast/canvas/gradient-empty-path-expected.txt (added)
• LayoutTests/fast/canvas/gradient-empty-path.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/html/CanvasRenderingContext2D.cpp (modified) (4 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2007-07-20  Rob Buis  <buis@kde.org>
+
+        Reviewed by Darin.
+
+        Testcase for:
+        http://bugs.webkit.org/show_bug.cgi?id=14642
+        REGRESSION(r24064-24096): Reflection type effect in canvas tag broke
+
+        * fast/canvas/gradient-empty-path-expected.checksum: Added.
+        * fast/canvas/gradient-empty-path-expected.png: Added.
+        * fast/canvas/gradient-empty-path-expected.txt: Added.
+        * fast/canvas/gradient-empty-path.html: Added.
+
 2007-07-19  Geoffrey Garen  <ggaren@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-07-20  Rob Buis  <buis@kde.org>
+
+        Reviewed by Darin.
+
+        http://bugs.webkit.org/show_bug.cgi?id=14642
+        REGRESSION(r24064-24096): Reflection type effect in canvas tag broke
+
+        Do not stop the fill/stroke operation when encountering an empty path.
+
+        * html/CanvasRenderingContext2D.cpp:
+        (WebCore::CanvasRenderingContext2D::fill):
+        (WebCore::CanvasRenderingContext2D::stroke):
+
 2007-07-20  Lars Knoll  <lars@trolltech.com>
 

trunk/WebCore/html/CanvasRenderingContext2D.cpp

@@ -444 +444 @@
     if (!c)
         return;
-    if (state().m_path.isEmpty())
-        return;
     // FIXME: Do this through platform-independent GraphicsContext API.
 #if PLATFORM(CG)
@@ -451 +449 @@
     CGContextAddPath(c->platformContext(), state().m_path.platformPath());
 
-    willDraw(CGContextGetPathBoundingBox(c->platformContext()));
+    if (!state().m_path.isEmpty())
+        willDraw(CGContextGetPathBoundingBox(c->platformContext()));
 
     if (state().m_fillStyle->gradient()) {
@@ -485 +484 @@
     if (!c)
         return;
-    if (state().m_path.isEmpty())
-        return;
     // FIXME: Do this through platform-independent GraphicsContext API.
 #if PLATFORM(CG)
@@ -492 +489 @@
     CGContextAddPath(c->platformContext(), state().m_path.platformPath());
 
-    float lineWidth = state().m_lineWidth;
-    float inset = -lineWidth / 2;
-    CGRect boundingRect = CGRectInset(CGContextGetPathBoundingBox(c->platformContext()), inset, inset);
-
-    willDraw(boundingRect);
+    if (!state().m_path.isEmpty()) {
+        float lineWidth = state().m_lineWidth;
+        float inset = -lineWidth / 2;
+        CGRect boundingRect = CGRectInset(CGContextGetPathBoundingBox(c->platformContext()), inset, inset);
+        willDraw(boundingRect);
+    }
 
     if (state().m_strokeStyle->gradient()) {