Changeset 69727 in webkit

Timestamp:

Oct 13, 2010 7:13:10 PM (14 years ago)

Author:

jamesr@google.com

Message:

2010-09-23 James Robinson <​jamesr@chromium.org>

Reviewed by Darin Adler.

Canvas: radialGradient with negative radius should throw exception
​https://bugs.webkit.org/show_bug.cgi?id=37176

Remove test from skipped lists now that it passes.

• platform/chromium/test_expectations.txt:
• platform/gtk/Skipped:
• platform/mac/Skipped:
• platform/qt/Skipped:

2010-10-13 James Robinson <​jamesr@chromium.org>

Reviewed by Darin Adler.

Throw INDEX_SIZE_ERR exception if createRadialGradient is called with a negative radius
Canvas: radialGradient with negative radius should throw exception
​https://bugs.webkit.org/show_bug.cgi?id=37176

This matches the canvas 2d specification, Opera, IE9 beta and our behavior for arc()
and arcTo(). Also fixes some PassRefPtr/RefPtr errors in this file.

Test: canvas/philip/tests/2d.gradient.radial.negative.html

• html/canvas/CanvasRenderingContext2D.cpp: (WebCore::CanvasRenderingContext2D::createLinearGradient): (WebCore::CanvasRenderingContext2D::createRadialGradient): (WebCore::createEmptyImageData): (WebCore::CanvasRenderingContext2D::measureText):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/chromium/test_expectations.txt (modified) (1 diff)
• LayoutTests/platform/gtk/Skipped (modified) (1 diff)
• LayoutTests/platform/mac/Skipped (modified) (1 diff)
• LayoutTests/platform/qt/Skipped (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/html/canvas/CanvasRenderingContext2D.cpp (modified) (4 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-09-23  James Robinson  <jamesr@chromium.org>
+
+        Reviewed by Darin Adler.
+
+        Canvas: radialGradient with negative radius should throw exception
+        https://bugs.webkit.org/show_bug.cgi?id=37176
+
+        Remove test from skipped lists now that it passes.
+
+        * platform/chromium/test_expectations.txt:
+        * platform/gtk/Skipped:
+        * platform/mac/Skipped:
+        * platform/qt/Skipped:
+
 2010-10-13  Jeremy Orlow  <jorlow@chromium.org>
 

trunk/LayoutTests/platform/chromium/test_expectations.txt

@@ -2569 +2569 @@
 BUG45991 : canvas/philip/tests/2d.fillStyle.parse.current.removed.html = TEXT PASS
 BUG45991 : canvas/philip/tests/2d.fillStyle.parse.system.html = TEXT PASS
-BUG45991 : canvas/philip/tests/2d.gradient.radial.negative.html = TEXT PASS
 BUG45991 : canvas/philip/tests/2d.imageData.get.source.negative.html = TEXT PASS
 BUG45991 : canvas/philip/tests/2d.path.rect.winding.html = TEXT PASS

trunk/LayoutTests/platform/gtk/Skipped

@@ -5572 +5572 @@
 canvas/philip/tests/2d.gradient.radial.inside2.html
 canvas/philip/tests/2d.gradient.radial.inside3.html
-canvas/philip/tests/2d.gradient.radial.negative.html
 canvas/philip/tests/2d.gradient.radial.outside1.html
 canvas/philip/tests/2d.imageData.create1.type.html

trunk/LayoutTests/platform/mac/Skipped

@@ -178 +178 @@
 canvas/philip/tests/2d.gradient.radial.inside2.html
 canvas/philip/tests/2d.gradient.radial.inside3.html
-canvas/philip/tests/2d.gradient.radial.negative.html
 canvas/philip/tests/2d.gradient.radial.outside1.html
 canvas/philip/tests/2d.imageData.create1.type.html

trunk/LayoutTests/platform/qt/Skipped

@@ -5189 +5189 @@
 canvas/philip/tests/2d.gradient.radial.cone.shape2.html
 canvas/philip/tests/2d.gradient.radial.cone.top.html
-canvas/philip/tests/2d.gradient.radial.negative.html
 canvas/philip/tests/2d.gradient.radial.touch1.html
 canvas/philip/tests/2d.gradient.radial.touch2.html

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-10-13  James Robinson  <jamesr@chromium.org>
+
+        Reviewed by Darin Adler.
+
+        Throw INDEX_SIZE_ERR exception if createRadialGradient is called with a negative radius
+        Canvas: radialGradient with negative radius should throw exception
+        https://bugs.webkit.org/show_bug.cgi?id=37176
+
+        This matches the canvas 2d specification, Opera, IE9 beta and our behavior for arc()
+        and arcTo().  Also fixes some PassRefPtr/RefPtr errors in this file.
+
+        Test: canvas/philip/tests/2d.gradient.radial.negative.html
+
+        * html/canvas/CanvasRenderingContext2D.cpp:
+        (WebCore::CanvasRenderingContext2D::createLinearGradient):
+        (WebCore::CanvasRenderingContext2D::createRadialGradient):
+        (WebCore::createEmptyImageData):
+        (WebCore::CanvasRenderingContext2D::measureText):
+
 2010-10-13  Fridrich Strba  <fridrich.strba@bluewin.ch>
 

trunk/WebCore/html/canvas/CanvasRenderingContext2D.cpp

@@ -1403 +1403 @@
     }
 
-    PassRefPtr<CanvasGradient> gradient = CanvasGradient::create(FloatPoint(x0, y0), FloatPoint(x1, y1));
+    RefPtr<CanvasGradient> gradient = CanvasGradient::create(FloatPoint(x0, y0), FloatPoint(x1, y1));
     prepareGradientForDashboard(gradient.get());
-    return gradient;
+    return gradient.release();
 }
 
@@ -1414 +1414 @@
         return 0;
     }
-    PassRefPtr<CanvasGradient> gradient =  CanvasGradient::create(FloatPoint(x0, y0), r0, FloatPoint(x1, y1), r1);
+
+    if (r0 < 0 || r1 < 0) {
+        ec = INDEX_SIZE_ERR;
+        return 0;
+    }
+
+    RefPtr<CanvasGradient> gradient = CanvasGradient::create(FloatPoint(x0, y0), r0, FloatPoint(x1, y1), r1);
     prepareGradientForDashboard(gradient.get());
-    return gradient;
+    return gradient.release();
 }
 
@@ -1514 +1520 @@
     RefPtr<ImageData> data = ImageData::create(size.width(), size.height());
     memset(data->data()->data()->data(), 0, data->data()->data()->length());
-    return data.get();
+    return data.release();
 }
 
@@ -1733 +1739 @@
 #endif
 
-    return metrics;
+    return metrics.release();
 }