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

[andreas.kling at nokia.com]

The following commit has been merged in the debian/experimental branch:
commit 77bbd1bd3eeae1b832bf2327203a54a2d943cdc0
Author: andreas.kling at nokia.com <andreas.kling at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jul 14 00:45:21 2010 +0000

    2010-07-13  Andreas Kling  <andreas.kling at nokia.com>
    
            Reviewed by Darin Adler.
    
            Canvas: rect(x,y,w,h) should move to (x,y) even if w=0 and h=0
            https://bugs.webkit.org/show_bug.cgi?id=42211
    
            * html/canvas/CanvasRenderingContext2D.cpp:
            (WebCore::CanvasRenderingContext2D::rect):
    2010-07-13  Eric Seidel  <eric at webkit.org>
    
            Reviewed by Adam Barth.
    
            Make our end tag in-foreign-content mode spec bug workarounds more closely match minefield
            https://bugs.webkit.org/show_bug.cgi?id=42187
    
            * html5lib/runner-expected-html5.txt:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63270 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 42a94de..90c3593 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -56,6 +56,18 @@
 
         Reviewed by Darin Adler.
 
+        Canvas: rect(x,y,w,h) should move to (x,y) even if w=0 and h=0
+        https://bugs.webkit.org/show_bug.cgi?id=42211
+
+        Unskip canvas/philip/tests/2d.path.rect.zero.4.html
+
+        * platform/mac/Skipped:
+        * platform/qt/Skipped:
+
+2010-07-13  Andreas Kling  <andreas.kling at nokia.com>
+
+        Reviewed by Darin Adler.
+
         Canvas: drawImage() with wrong 'image' argument type should always throw TypeError
         https://bugs.webkit.org/show_bug.cgi?id=42160
 
diff --git a/LayoutTests/platform/mac/Skipped b/LayoutTests/platform/mac/Skipped
index c3dac81..3edf261 100644
--- a/LayoutTests/platform/mac/Skipped
+++ b/LayoutTests/platform/mac/Skipped
@@ -224,7 +224,6 @@ canvas/philip/tests/2d.missingargs.html
 canvas/philip/tests/2d.path.arcTo.ensuresubpath.2.html
 canvas/philip/tests/2d.path.clip.empty.html
 canvas/philip/tests/2d.path.rect.winding.html
-canvas/philip/tests/2d.path.rect.zero.4.html
 canvas/philip/tests/2d.path.stroke.prune.arc.html
 canvas/philip/tests/2d.path.stroke.prune.closed.html
 canvas/philip/tests/2d.path.stroke.prune.curve.html
diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index dcf18c3..8e5e945 100644
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -5289,7 +5289,6 @@ canvas/philip/tests/2d.path.arc.twopie.3.html
 canvas/philip/tests/2d.path.quadraticCurveTo.scaled.html
 canvas/philip/tests/2d.path.quadraticCurveTo.shape.html
 canvas/philip/tests/2d.path.rect.winding.html
-canvas/philip/tests/2d.path.rect.zero.4.html
 canvas/philip/tests/2d.path.rect.zero.6.html
 canvas/philip/tests/2d.path.stroke.scale2.html
 canvas/philip/tests/2d.pattern.image.broken.html
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 2f9b841..a287271 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-07-13  Andreas Kling  <andreas.kling at nokia.com>
+
+        Reviewed by Darin Adler.
+
+        Canvas: rect(x,y,w,h) should move to (x,y) even if w=0 and h=0
+        https://bugs.webkit.org/show_bug.cgi?id=42211
+
+        * html/canvas/CanvasRenderingContext2D.cpp:
+        (WebCore::CanvasRenderingContext2D::rect):
+
 2010-07-13  Simon Fraser  <simon.fraser at apple.com>
 
         Reviewed by Dan Bernstein.
diff --git a/WebCore/html/canvas/CanvasRenderingContext2D.cpp b/WebCore/html/canvas/CanvasRenderingContext2D.cpp
index b3d212a..0db3505 100644
--- a/WebCore/html/canvas/CanvasRenderingContext2D.cpp
+++ b/WebCore/html/canvas/CanvasRenderingContext2D.cpp
@@ -646,10 +646,27 @@ static bool validateRectForCanvas(float& x, float& y, float& width, float& heigh
 
 void CanvasRenderingContext2D::rect(float x, float y, float width, float height)
 {
-    if (!validateRectForCanvas(x, y, width, height))
-        return;
     if (!state().m_invertibleCTM)
         return;
+
+    if (!isfinite(x) || !isfinite(y) || !isfinite(width) || !isfinite(height))
+        return;
+
+    if (!width && !height) {
+        m_path.moveTo(FloatPoint(x, y));
+        return;
+    }
+
+    if (width < 0) {
+        width = -width;
+        x -= width;
+    }
+
+    if (height < 0) {
+        height = -height;
+        y -= height;
+    }
+
     m_path.addRect(FloatRect(x, y, width, height));
 }
 

-- 
WebKit Debian packaging