[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da

Wed Dec 22 18:31:35 UTC 2010

The following commit has been merged in the debian/experimental branch:
commit aa96ed47dd8ba1c6a701e3343e9069feedb87430
Author: mihaip at chromium.org <mihaip at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Dec 13 18:15:36 2010 +0000

    2010-12-13  Mihai Parparita  <mihaip at 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 at 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):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73926 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 1605ed4..8c30722 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2010-12-13  Mihai Parparita  <mihaip at 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 at chromium.org>
 
         Reviewed by Ojan Vafai.
diff --git a/LayoutTests/fast/canvas/strokeText-missing-args-expected.txt b/LayoutTests/fast/canvas/strokeText-missing-args-expected.txt
new file mode 100644
index 0000000..7607484
--- /dev/null
+++ b/LayoutTests/fast/canvas/strokeText-missing-args-expected.txt
@@ -0,0 +1 @@
+SUCCESS: This test should not time out.
diff --git a/LayoutTests/fast/canvas/strokeText-missing-args.html b/LayoutTests/fast/canvas/strokeText-missing-args.html
new file mode 100644
index 0000000..ffbb5a6
--- /dev/null
+++ b/LayoutTests/fast/canvas/strokeText-missing-args.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html>
+<body>
+<script>
+  if (window.layoutTestController)
+      layoutTestController.dumpAsText();
+  try {
+    document.createElement('canvas').getContext('2d').strokeText();
+  } catch (err) {
+    // An exception may be thrown if arguments to strokeText are missing, ignore
+    // it.
+  }
+</script>
+SUCCESS: This test should not time out.
+</body>
+</html>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index c9b4711..5b3ad7b 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2010-12-13  Mihai Parparita  <mihaip at 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 at apple.com>
 
         Reviewed by Simon Fraser.
diff --git a/WebCore/html/canvas/CanvasRenderingContext2D.cpp b/WebCore/html/canvas/CanvasRenderingContext2D.cpp
index e79706f..1f32c6e 100644
--- a/WebCore/html/canvas/CanvasRenderingContext2D.cpp
+++ b/WebCore/html/canvas/CanvasRenderingContext2D.cpp
@@ -1756,6 +1756,8 @@ void CanvasRenderingContext2D::drawTextInternal(const String& text, float x, flo
         return;
     if (!state().m_invertibleCTM)
         return;
+    if (!isfinite(x) | !isfinite(y))
+        return;
 
     const Font& font = accessFont();
 

-- 
WebKit Debian packaging

