Attachment 71821 Details for Bug 48277 – Patch

[patch] Patch

bug-48277-20101026110849.patch (text/plain), 4.59 KB, created by Mike Lawther on 2010-10-25 17:08:52 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Mike Lawther

Created: 2010-10-25 17:08:52 PDT

Size: 4.59 KB

patch

obsolete

>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index c231b9037ed94110cb6243a2bd424e6ee8c22929..1f0de1c8c89473bb6db84109e2ce9a085177dd88 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,15 @@
>+2010-10-25  Mike Lawther  <mikelawther@chromium.org>
>+
>+        Fix canvas/philip/tests/2d.imageData.get.source.negative
>+        https://bugs.webkit.org/show_bug.cgi?id=48277
>+
>+        Remove canvas/philip/tests/2d.imageData.get.source.negative from skipped.
>+        Also remove spurious trailing newlines from 2d.imageData.get.source.negative-expected.txt
>+
>+        * canvas/philip/tests/2d.imageData.get.source.negative-expected.txt:
>+        * platform/chromium/test_expectations.txt:
>+        * platform/mac/Skipped:
>+
> 2010-10-25  Kenneth Russell  <kbr@google.com>
> 
>         Unreviewed, test expectations update. Temporarily WebGL layout
>diff --git a/LayoutTests/canvas/philip/tests/2d.imageData.get.source.negative-expected.txt b/LayoutTests/canvas/philip/tests/2d.imageData.get.source.negative-expected.txt
>index cb8c43fd50b22649679fcf59ef15569392911c42..3b83b947e885c18a38d2eb437706c2ea49ef6d6b 100644
>--- a/LayoutTests/canvas/philip/tests/2d.imageData.get.source.negative-expected.txt
>+++ b/LayoutTests/canvas/philip/tests/2d.imageData.get.source.negative-expected.txt
>@@ -4,6 +4,3 @@ getImageData() works with negative width and height, and returns top-to-bottom l
> References: 2d.imageData.get.basic 2d.pixelarray.order
> Actual output:
> Passed
>-
>-
>-
>diff --git a/LayoutTests/platform/chromium/test_expectations.txt b/LayoutTests/platform/chromium/test_expectations.txt
>index cd085f64db28588667e76bbb70c5c11bd6e5c67c..e57b1700a37ceaea9c74084bdee46213f6f47fe8 100644
>--- a/LayoutTests/platform/chromium/test_expectations.txt
>+++ b/LayoutTests/platform/chromium/test_expectations.txt
>@@ -2553,7 +2553,6 @@ BUG45991 : canvas/philip/tests/2d.fillStyle.parse.current.basic.html = TEXT PASS
> BUG45991 : canvas/philip/tests/2d.fillStyle.parse.current.changed.html = TEXT PASS
> BUG45991 : canvas/philip/tests/2d.fillStyle.parse.current.removed.html = TEXT PASS
> BUG45991 : canvas/philip/tests/2d.fillStyle.parse.system.html = TEXT PASS
>-BUG45991 : canvas/philip/tests/2d.imageData.get.source.negative.html = TEXT PASS
> BUG45991 : canvas/philip/tests/2d.path.rect.winding.html = TEXT PASS
> BUG45991 : canvas/philip/tests/2d.pattern.image.undefined.html = TEXT PASS
> BUG45991 : canvas/philip/tests/2d.shadow.gradient.alpha.html = TEXT PASS
>diff --git a/LayoutTests/platform/mac/Skipped b/LayoutTests/platform/mac/Skipped
>index dec644f369956806fd095b8746b4d224f1c8e234..646122d4b5e3b82045682a99e8c42799c1f1af4f 100644
>--- a/LayoutTests/platform/mac/Skipped
>+++ b/LayoutTests/platform/mac/Skipped
>@@ -177,7 +177,6 @@ canvas/philip/tests/2d.gradient.radial.inside3.html
> canvas/philip/tests/2d.gradient.radial.outside1.html
> canvas/philip/tests/2d.imageData.create1.type.html
> canvas/philip/tests/2d.imageData.create2.type.html
>-canvas/philip/tests/2d.imageData.get.source.negative.html
> canvas/philip/tests/2d.imageData.get.source.outside.html
> canvas/philip/tests/2d.imageData.get.type.html
> canvas/philip/tests/2d.line.cap.closed.html
>diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
>index fa58925d9b2b236db9577e4d19a59ffbf3478615..9feb71d74179a5b86fb7927363a70b820286373f 100644
>--- a/WebCore/ChangeLog
>+++ b/WebCore/ChangeLog
>@@ -1,3 +1,16 @@
>+2010-10-25  Mike Lawther  <mikelawther@chromium.org>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Fix canvas/philip/tests/2d.imageData.get.source.negative
>+        https://bugs.webkit.org/show_bug.cgi?id=48277
>+
>+        Handle negative width/height.
>+        See http://www.whatwg.org/specs/web-apps/current-work/multipage/the-canvas-element.html#pixel-manipulation
>+
>+        * html/canvas/CanvasRenderingContext2D.cpp:
>+        (WebCore::CanvasRenderingContext2D::getImageData):
>+
> 2010-10-25  Ryosuke Niwa  <rniwa@webkit.org>
> 
>         Unreviewed Qt build fix for r70496.
>diff --git a/WebCore/html/canvas/CanvasRenderingContext2D.cpp b/WebCore/html/canvas/CanvasRenderingContext2D.cpp
>index b1d7b233d2b5a8e6f70739c603e13e28da1ee337..a2d9e98ca33829228e06f220ff73d5729d407145 100644
>--- a/WebCore/html/canvas/CanvasRenderingContext2D.cpp
>+++ b/WebCore/html/canvas/CanvasRenderingContext2D.cpp
>@@ -1582,6 +1582,15 @@ PassRefPtr<ImageData> CanvasRenderingContext2D::getImageData(float sx, float sy,
>         return 0;
>     }
> 
>+    if (sw < 0) {
>+        sx += sw;
>+        sw = -sw;
>+    }    
>+    if (sh < 0) {
>+        sy += sh;
>+        sh = -sh;
>+    }
>+    
>     FloatRect unscaledRect(sx, sy, sw, sh);
>     IntRect scaledRect = canvas()->convertLogicalToDevice(unscaledRect);
>     if (scaledRect.width() < 1)

Actions: View | Formatted Diff | Diff

Attachments on bug 48277: 71821 | 72402