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

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit f144f730922d291a642a96142f9d881e42a9515b
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 10 05:06:48 2010 +0000

    2010-11-09  Helder Correia  <helder at sencha.com>
    
            Reviewed by Darin Adler.
    
            Philip Canvas test 2d.path.rect.winding fails
            https://bugs.webkit.org/show_bug.cgi?id=49225
    
            Remove test from skipped list.
    
            * platform/gtk/Skipped:
            * platform/mac-leopard/Skipped:
            * platform/qt/Skipped:
    2010-11-09  Helder Correia  <helder at sencha.com>
    
            Reviewed by Darin Adler.
    
            Philip Canvas test 2d.path.rect.winding fails
            https://bugs.webkit.org/show_bug.cgi?id=49225
    
            Rect path direction is important for nonzero winding rule.
    
            The rect(x, y, w, h) method must create a new subpath containing just the four points
            (x, y), (x+w, y), (x+w, y+h), (x, y+h), with those four points connected by straight
            lines, and must then mark the subpath as closed.
    
            * html/canvas/CanvasRenderingContext2D.cpp:
            (WebCore::CanvasRenderingContext2D::rect):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71716 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index ccde06d..a30e528 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,16 @@
+2010-11-09  Helder Correia  <helder at sencha.com>
+
+        Reviewed by Darin Adler.
+
+        Philip Canvas test 2d.path.rect.winding fails
+        https://bugs.webkit.org/show_bug.cgi?id=49225
+
+        Remove test from skipped list.
+
+        * platform/gtk/Skipped:
+        * platform/mac-leopard/Skipped:
+        * platform/qt/Skipped:
+
 2010-11-09  Adrienne Walker  <enne at google.com>
 
         Reviewed by Kenneth Russell.
diff --git a/LayoutTests/platform/gtk/Skipped b/LayoutTests/platform/gtk/Skipped
index 538a23c..1508d41 100644
--- a/LayoutTests/platform/gtk/Skipped
+++ b/LayoutTests/platform/gtk/Skipped
@@ -5334,7 +5334,6 @@ canvas/philip/tests/2d.line.miter.lineedge.html
 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.pattern.image.broken.html
 canvas/philip/tests/2d.pattern.image.incomplete.html
 canvas/philip/tests/2d.shadow.enable.blur.html
diff --git a/LayoutTests/platform/mac-leopard/Skipped b/LayoutTests/platform/mac-leopard/Skipped
index 019b06e..dc29d8c 100644
--- a/LayoutTests/platform/mac-leopard/Skipped
+++ b/LayoutTests/platform/mac-leopard/Skipped
@@ -130,7 +130,6 @@ canvas/philip/tests/2d.line.miter.lineedge.html
 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.pattern.image.broken.html
 canvas/philip/tests/2d.pattern.image.incomplete.html
 canvas/philip/tests/2d.shadow.enable.blur.html
diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index a477fe4..94a20ce 100644
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -5063,7 +5063,6 @@ canvas/philip/tests/2d.line.miter.lineedge.html
 canvas/philip/tests/2d.missingargs.html
 canvas/philip/tests/2d.path.quadraticCurveTo.shape.html
 canvas/philip/tests/2d.path.quadraticCurveTo.scaled.html
-canvas/philip/tests/2d.path.rect.winding.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 0575ccf..24f362d 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2010-11-09  Helder Correia  <helder at sencha.com>
+
+        Reviewed by Darin Adler.
+
+        Philip Canvas test 2d.path.rect.winding fails
+        https://bugs.webkit.org/show_bug.cgi?id=49225
+
+        Rect path direction is important for nonzero winding rule.
+
+        The rect(x, y, w, h) method must create a new subpath containing just the four points
+        (x, y), (x+w, y), (x+w, y+h), (x, y+h), with those four points connected by straight
+        lines, and must then mark the subpath as closed.
+
+        * html/canvas/CanvasRenderingContext2D.cpp:
+        (WebCore::CanvasRenderingContext2D::rect):
+
 2010-11-09  Fumitoshi Ukai  <ukai at chromium.org>
 
         Unreviewed build fix on Chromium/Win at r71711
diff --git a/WebCore/html/canvas/CanvasRenderingContext2D.cpp b/WebCore/html/canvas/CanvasRenderingContext2D.cpp
index a2d9e98..b9f86ce 100644
--- a/WebCore/html/canvas/CanvasRenderingContext2D.cpp
+++ b/WebCore/html/canvas/CanvasRenderingContext2D.cpp
@@ -793,16 +793,6 @@ void CanvasRenderingContext2D::rect(float x, float y, float width, float height)
         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