Changeset 73926 in webkit

Timestamp:

Dec 13, 2010 10:15:36 AM (13 years ago)

Author:

mihaip@chromium.org

Message:

2010-12-13 Mihai Parparita <​mihaip@chromium.org>

Reviewed by Adam Barth.

[Chromium] canvas/philip/tests/2d.missingargs.html hangs on Snow Leopard
​https://bugs.webkit.org/show_bug.cgi?id=50841

Add test that calls strokeText() (i.e. with no arguments).

• fast/canvas/strokeText-missing-args-expected.txt: Added.
• fast/canvas/strokeText-missing-args.html: Added.

2010-12-13 Mihai Parparita <​mihaip@chromium.org>

Reviewed by Adam Barth.

[Chromium] canvas/philip/tests/2d.missingargs.html hangs on Snow Leopard
​https://bugs.webkit.org/show_bug.cgi?id=50841

Test: fast/canvas/strokeText-missing-args.html

We didn't have isfinite checks for the x and y coordinates that are
passed to strokeText/drawTextInternal (unlike all the other methods,
which got checks in r50910 and r59447).

• html/canvas/CanvasRenderingContext2D.cpp: (WebCore::CanvasRenderingContext2D::drawTextInternal):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/canvas/strokeText-missing-args-expected.txt (added)
• LayoutTests/fast/canvas/strokeText-missing-args.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/html/canvas/CanvasRenderingContext2D.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-12-13  Mihai Parparita  <mihaip@chromium.org>
+
+        Reviewed by Adam Barth.
+
+        [Chromium] canvas/philip/tests/2d.missingargs.html hangs on Snow Leopard
+        https://bugs.webkit.org/show_bug.cgi?id=50841
+        
+        Add test that calls strokeText() (i.e. with no arguments).
+
+        * fast/canvas/strokeText-missing-args-expected.txt: Added.
+        * fast/canvas/strokeText-missing-args.html: Added.
+
 2010-12-13  Benjamin Kalman  <kalman@chromium.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-12-13  Mihai Parparita  <mihaip@chromium.org>
+
+        Reviewed by Adam Barth.
+
+        [Chromium] canvas/philip/tests/2d.missingargs.html hangs on Snow Leopard
+        https://bugs.webkit.org/show_bug.cgi?id=50841
+
+        Test: fast/canvas/strokeText-missing-args.html
+        
+        We didn't have isfinite checks for the x and y coordinates that are
+        passed to strokeText/drawTextInternal (unlike all the other methods,
+        which got checks in r50910 and r59447).
+
+        * html/canvas/CanvasRenderingContext2D.cpp:
+        (WebCore::CanvasRenderingContext2D::drawTextInternal):
+
 2010-12-09  Matthew Delaney  <mdelaney@apple.com>
 

trunk/WebCore/html/canvas/CanvasRenderingContext2D.cpp

@@ -1757 +1757 @@
     if (!state().m_invertibleCTM)
         return;
+    if (!isfinite(x) | !isfinite(y))
+        return;
 
     const Font& font = accessFont();