Changeset 59447 in webkit

Timestamp:

May 14, 2010 12:43:41 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-05-14 Andreas Kling <​andreas.kling@nokia.com>

Reviewed by Darin Adler.

Add test to check that setting various CanvasRenderingContext2D properties
to invalid values is ignored.

​https://bugs.webkit.org/show_bug.cgi?id=38841

• fast/canvas/canvas-invalid-values-expected.txt: Added.
• fast/canvas/canvas-invalid-values.html: Added.
• fast/canvas/script-tests/canvas-invalid-values.js: Added. (trySettingMiterLimit): (trySettingLineWidth): (trySettingShadowBlur): (trySettingShadowOffsetX): (trySettingShadowOffsetY):

2010-05-14 Andreas Kling <​andreas.kling@nokia.com>

Reviewed by Darin Adler.

Ignore invalid values for various CanvasRenderingContext2D properties
(lineWidth, miterLimit, shadowOffsetX, shadowOffsetY and shadowBlur)

​https://bugs.webkit.org/show_bug.cgi?id=38841

Test: fast/canvas/canvas-invalid-values.html

• html/canvas/CanvasRenderingContext2D.cpp: (WebCore::CanvasRenderingContext2D::setLineWidth): (WebCore::CanvasRenderingContext2D::setMiterLimit): (WebCore::CanvasRenderingContext2D::setShadowOffsetX): (WebCore::CanvasRenderingContext2D::setShadowOffsetY): (WebCore::CanvasRenderingContext2D::setShadowBlur):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/canvas/canvas-invalid-values-expected.txt (added)
• LayoutTests/fast/canvas/canvas-invalid-values.html (added)
• LayoutTests/fast/canvas/script-tests/canvas-invalid-values.js (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/html/canvas/CanvasRenderingContext2D.cpp (modified) (5 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-05-14  Andreas Kling  <andreas.kling@nokia.com>
+
+        Reviewed by Darin Adler.
+
+        Add test to check that setting various CanvasRenderingContext2D properties
+        to invalid values is ignored.
+
+        https://bugs.webkit.org/show_bug.cgi?id=38841
+
+        * fast/canvas/canvas-invalid-values-expected.txt: Added.
+        * fast/canvas/canvas-invalid-values.html: Added.
+        * fast/canvas/script-tests/canvas-invalid-values.js: Added.
+        (trySettingMiterLimit):
+        (trySettingLineWidth):
+        (trySettingShadowBlur):
+        (trySettingShadowOffsetX):
+        (trySettingShadowOffsetY):
+
 2010-05-13  Simon Fraser  <simon.fraser@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-05-14  Andreas Kling  <andreas.kling@nokia.com>
+
+        Reviewed by Darin Adler.
+
+        Ignore invalid values for various CanvasRenderingContext2D properties
+        (lineWidth, miterLimit, shadowOffsetX, shadowOffsetY and shadowBlur)
+
+        https://bugs.webkit.org/show_bug.cgi?id=38841
+
+        Test: fast/canvas/canvas-invalid-values.html
+
+        * html/canvas/CanvasRenderingContext2D.cpp:
+        (WebCore::CanvasRenderingContext2D::setLineWidth):
+        (WebCore::CanvasRenderingContext2D::setMiterLimit):
+        (WebCore::CanvasRenderingContext2D::setShadowOffsetX):
+        (WebCore::CanvasRenderingContext2D::setShadowOffsetY):
+        (WebCore::CanvasRenderingContext2D::setShadowBlur):
+
 2010-05-13  Timothy Hatcher  <timothy@apple.com>
 

trunk/WebCore/html/canvas/CanvasRenderingContext2D.cpp

@@ -216 +216 @@
 void CanvasRenderingContext2D::setLineWidth(float width)
 {
-    if (!(width > 0))
+    if (!(isfinite(width) && width > 0))
         return;
     state().m_lineWidth = width;
@@ -266 +266 @@
 void CanvasRenderingContext2D::setMiterLimit(float limit)
 {
-    if (!(limit > 0))
+    if (!(isfinite(limit) && limit > 0))
         return;
     state().m_miterLimit = limit;
@@ -282 +282 @@
 void CanvasRenderingContext2D::setShadowOffsetX(float x)
 {
+    if (!isfinite(x))
+        return;
     state().m_shadowOffset.setWidth(x);
     applyShadow();
@@ -293 +295 @@
 void CanvasRenderingContext2D::setShadowOffsetY(float y)
 {
+    if (!isfinite(y))
+        return;
     state().m_shadowOffset.setHeight(y);
     applyShadow();
@@ -304 +308 @@
 void CanvasRenderingContext2D::setShadowBlur(float blur)
 {
+    if (!(isfinite(blur) && blur >= 0))
+        return;
     state().m_shadowBlur = blur;
     applyShadow();