[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
commit-queue at webkit.org
commit-queue at webkit.org
Wed Dec 22 15:18:18 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 60bdea8ccc9c800f512fee42ba0c580b1225d24d
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Oct 30 00:13:13 2010 +0000
2010-10-29 Mike Lawther <mikelawther at chromium.org>
Reviewed by James Robinson.
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 chromium 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:
2010-10-29 Mike Lawther <mikelawther at chromium.org>
Reviewed by James Robinson.
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):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70957 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 93c4077..74f8e6f 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,16 @@
+2010-10-29 Mike Lawther <mikelawther at chromium.org>
+
+ Reviewed by James Robinson.
+
+ 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 chromium 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:
+
2010-10-29 Aaron Colwell <acolwell at chromium.org>
Reviewed by David Levin.
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 cb8c43f..3b83b94 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 d425498..00c1eda 100644
--- a/LayoutTests/platform/chromium/test_expectations.txt
+++ b/LayoutTests/platform/chromium/test_expectations.txt
@@ -2565,7 +2565,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-snowleopard/canvas/philip/tests/2d.imageData.get.source.negative-expected.txt b/LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.imageData.get.source.negative-expected.txt
deleted file mode 100644
index 3dfd3be..0000000
--- a/LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.imageData.get.source.negative-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-< [index] >
-2d.imageData.get.source.negative
-getImageData() works with negative width and height, and returns top-to-bottom left-to-right
-References: 2d.imageData.get.basic 2d.pixelarray.order
-Actual output:
-Failed assertion imgdata1.data["0"] === 255 (got 0[number], expected 255[number])
-Failed assertion imgdata1.data["1"] === 255 (got 0[number], expected 255[number])
-Failed assertion imgdata1.data["2"] === 255 (got 0[number], expected 255[number])
-Failed assertion imgdata2.data["3"] === 0 (got 255[number], expected 0[number])
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index a97a4a8..bbe8c4a 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-10-29 Mike Lawther <mikelawther at chromium.org>
+
+ Reviewed by James Robinson.
+
+ 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-29 Kavita Kanetkar <kkanetkar at chromium.org>
Reviewed by Pavel Feldman.
diff --git a/WebCore/html/canvas/CanvasRenderingContext2D.cpp b/WebCore/html/canvas/CanvasRenderingContext2D.cpp
index b1d7b23..a2d9e98 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)
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list