Diff
Modified: trunk/LayoutTests/ChangeLog (126026 => 126027)
--- trunk/LayoutTests/ChangeLog 2012-08-20 14:50:24 UTC (rev 126026)
+++ trunk/LayoutTests/ChangeLog 2012-08-20 15:04:59 UTC (rev 126027)
@@ -1,3 +1,25 @@
+2012-08-20 Thiago Marcos P. Santos <[email protected]>
+
+ Update canvas tests that are using CanvasPixelArray
+ https://bugs.webkit.org/show_bug.cgi?id=94474
+
+ Reviewed by Andreas Kling.
+
+ CanvasPixelArray is deprecated. W3C already updated these tests on the
+ approved tests repository. Using Uint8ClampedArray, they now pass on
+ WebKit.
+
+ * canvas/philip/tests/2d.imageData.create1.type.html:
+ * canvas/philip/tests/2d.imageData.create2.type.html:
+ * canvas/philip/tests/2d.imageData.get.type.html:
+ * platform/chromium/TestExpectations:
+ * platform/efl/Skipped:
+ * platform/gtk/TestExpectations:
+ * platform/mac/canvas/philip/tests/2d.imageData.create1.type-expected.txt: Removed.
+ * platform/mac/canvas/philip/tests/2d.imageData.create2.type-expected.txt: Removed.
+ * platform/mac/canvas/philip/tests/2d.imageData.get.type-expected.txt: Removed.
+ * platform/qt/Skipped:
+
2012-08-20 Allan Sandfeld Jensen <[email protected]>
[TouchAdjustment] Adjust to word or selection
Modified: trunk/LayoutTests/canvas/philip/tests/2d.imageData.create1.type.html (126026 => 126027)
--- trunk/LayoutTests/canvas/philip/tests/2d.imageData.create1.type.html 2012-08-20 14:50:24 UTC (rev 126026)
+++ trunk/LayoutTests/canvas/philip/tests/2d.imageData.create1.type.html 2012-08-20 15:04:59 UTC (rev 126027)
@@ -13,12 +13,12 @@
_addTest(function(canvas, ctx) {
_assertDifferent(window.ImageData, undefined, "window.ImageData", "undefined");
-_assertDifferent(window.CanvasPixelArray, undefined, "window.CanvasPixelArray", "undefined");
+_assertDifferent(window.Uint8ClampedArray, undefined, "window.Uint8ClampedArray", "undefined");
window.ImageData.prototype.thisImplementsImageData = true;
-window.CanvasPixelArray.prototype.thisImplementsCanvasPixelArray = true;
+window.Uint8ClampedArray.prototype.thisImplementsUint8ClampedArray = true;
var imgdata = ctx.createImageData(ctx.createImageData(1, 1));
_assert(imgdata.thisImplementsImageData, "imgdata.thisImplementsImageData");
-_assert(imgdata.data.thisImplementsCanvasPixelArray, "imgdata.data.thisImplementsCanvasPixelArray");
+_assert(imgdata.data.thisImplementsUint8ClampedArray, "imgdata.data.thisImplementsUint8ClampedArray");
});
Modified: trunk/LayoutTests/canvas/philip/tests/2d.imageData.create2.type.html (126026 => 126027)
--- trunk/LayoutTests/canvas/philip/tests/2d.imageData.create2.type.html 2012-08-20 14:50:24 UTC (rev 126026)
+++ trunk/LayoutTests/canvas/philip/tests/2d.imageData.create2.type.html 2012-08-20 15:04:59 UTC (rev 126027)
@@ -13,12 +13,12 @@
_addTest(function(canvas, ctx) {
_assertDifferent(window.ImageData, undefined, "window.ImageData", "undefined");
-_assertDifferent(window.CanvasPixelArray, undefined, "window.CanvasPixelArray", "undefined");
+_assertDifferent(window.Uint8ClampedArray, undefined, "window.Uint8ClampedArray", "undefined");
window.ImageData.prototype.thisImplementsImageData = true;
-window.CanvasPixelArray.prototype.thisImplementsCanvasPixelArray = true;
+window.Uint8ClampedArray.prototype.thisImplementsUint8ClampedArray = true;
var imgdata = ctx.createImageData(1, 1);
_assert(imgdata.thisImplementsImageData, "imgdata.thisImplementsImageData");
-_assert(imgdata.data.thisImplementsCanvasPixelArray, "imgdata.data.thisImplementsCanvasPixelArray");
+_assert(imgdata.data.thisImplementsUint8ClampedArray, "imgdata.data.thisImplementsUint8ClampedArray");
});
Modified: trunk/LayoutTests/canvas/philip/tests/2d.imageData.get.type.html (126026 => 126027)
--- trunk/LayoutTests/canvas/philip/tests/2d.imageData.get.type.html 2012-08-20 14:50:24 UTC (rev 126026)
+++ trunk/LayoutTests/canvas/philip/tests/2d.imageData.get.type.html 2012-08-20 15:04:59 UTC (rev 126027)
@@ -13,12 +13,12 @@
_addTest(function(canvas, ctx) {
_assertDifferent(window.ImageData, undefined, "window.ImageData", "undefined");
-_assertDifferent(window.CanvasPixelArray, undefined, "window.CanvasPixelArray", "undefined");
+_assertDifferent(window.Uint8ClampedArray, undefined, "window.Uint8ClampedArray", "undefined");
window.ImageData.prototype.thisImplementsImageData = true;
-window.CanvasPixelArray.prototype.thisImplementsCanvasPixelArray = true;
-var imgdata = ctx.getImageData(0, 0, 1, 1);
+window.Uint8ClampedArray.prototype.thisImplementsUint8ClampedArray = true;
+var imgdata = ctx.createImageData(1, 1);
_assert(imgdata.thisImplementsImageData, "imgdata.thisImplementsImageData");
-_assert(imgdata.data.thisImplementsCanvasPixelArray, "imgdata.data.thisImplementsCanvasPixelArray");
+_assert(imgdata.data.thisImplementsUint8ClampedArray, "imgdata.data.thisImplementsUint8ClampedArray");
});
Modified: trunk/LayoutTests/platform/chromium/TestExpectations (126026 => 126027)
--- trunk/LayoutTests/platform/chromium/TestExpectations 2012-08-20 14:50:24 UTC (rev 126026)
+++ trunk/LayoutTests/platform/chromium/TestExpectations 2012-08-20 15:04:59 UTC (rev 126027)
@@ -1865,13 +1865,6 @@
BUGWK45991 : canvas/philip/tests/2d.drawImage.broken.html = TEXT
BUGWK45991 : platform/chromium/virtual/gpu/canvas/philip/tests/2d.drawImage.broken.html = TEXT
-BUGWK39212 : canvas/philip/tests/2d.imageData.create1.type.html = TEXT
-BUGWK39212 : canvas/philip/tests/2d.imageData.create2.type.html = TEXT
-BUGWK39212 : canvas/philip/tests/2d.imageData.get.type.html = TEXT
-BUGWK39212 : platform/chromium/virtual/gpu/canvas/philip/tests/2d.imageData.create1.type.html = TEXT
-BUGWK39212 : platform/chromium/virtual/gpu/canvas/philip/tests/2d.imageData.create2.type.html = TEXT
-BUGWK39212 : platform/chromium/virtual/gpu/canvas/philip/tests/2d.imageData.get.type.html = TEXT
-
BUGWK94246 : canvas/philip/tests/2d.imageData.object.round.html = TEXT
BUGWK94246 : platform/chromium/virtual/gpu/canvas/philip/tests/2d.imageData.object.round.html = TEXT
BUGWK94246 : fast/canvas/canvas-ImageData-behaviour.html = TEXT
Modified: trunk/LayoutTests/platform/efl/Skipped (126026 => 126027)
--- trunk/LayoutTests/platform/efl/Skipped 2012-08-20 14:50:24 UTC (rev 126026)
+++ trunk/LayoutTests/platform/efl/Skipped 2012-08-20 15:04:59 UTC (rev 126027)
@@ -308,9 +308,6 @@
canvas/philip/tests/2d.fillStyle.parse.invalid.rgba-6.html
canvas/philip/tests/2d.fillStyle.parse.rgb-eof.html
canvas/philip/tests/2d.fillStyle.parse.rgba-eof.html
-canvas/philip/tests/2d.imageData.create1.type.html
-canvas/philip/tests/2d.imageData.create2.type.html
-canvas/philip/tests/2d.imageData.get.type.html
canvas/philip/tests/2d.missingargs.html
canvas/philip/tests/2d.pattern.image.broken.html
canvas/philip/tests/2d.pattern.image.incomplete.empty.html
Modified: trunk/LayoutTests/platform/gtk/TestExpectations (126026 => 126027)
--- trunk/LayoutTests/platform/gtk/TestExpectations 2012-08-20 14:50:24 UTC (rev 126026)
+++ trunk/LayoutTests/platform/gtk/TestExpectations 2012-08-20 15:04:59 UTC (rev 126027)
@@ -909,9 +909,6 @@
BUGWKGTK : canvas/philip/tests/2d.fillStyle.parse.invalid.rgba-6.html = TEXT
BUGWKGTK : canvas/philip/tests/2d.fillStyle.parse.rgb-eof.html = TEXT
BUGWKGTK : canvas/philip/tests/2d.fillStyle.parse.rgba-eof.html = TEXT
-BUGWKGTK : canvas/philip/tests/2d.imageData.create1.type.html = TEXT
-BUGWKGTK : canvas/philip/tests/2d.imageData.create2.type.html = TEXT
-BUGWKGTK : canvas/philip/tests/2d.imageData.get.type.html = TEXT
BUGWKGTK : canvas/philip/tests/2d.missingargs.html = TEXT
BUGWKGTK : canvas/philip/tests/2d.pattern.image.broken.html = TEXT
BUGWKGTK : canvas/philip/tests/2d.pattern.image.incomplete.empty.html = TEXT
Deleted: trunk/LayoutTests/platform/mac/canvas/philip/tests/2d.imageData.create1.type-expected.txt (126026 => 126027)
--- trunk/LayoutTests/platform/mac/canvas/philip/tests/2d.imageData.create1.type-expected.txt 2012-08-20 14:50:24 UTC (rev 126026)
+++ trunk/LayoutTests/platform/mac/canvas/philip/tests/2d.imageData.create1.type-expected.txt 2012-08-20 15:04:59 UTC (rev 126027)
@@ -1,2 +0,0 @@
-Failed assertion window.CanvasPixelArray !== undefined (got [undefined], expected not [undefined])
-Aborted with exception: 'undefined' is not an object (evaluating 'window.CanvasPixelArray.prototype')
Deleted: trunk/LayoutTests/platform/mac/canvas/philip/tests/2d.imageData.create2.type-expected.txt (126026 => 126027)
--- trunk/LayoutTests/platform/mac/canvas/philip/tests/2d.imageData.create2.type-expected.txt 2012-08-20 14:50:24 UTC (rev 126026)
+++ trunk/LayoutTests/platform/mac/canvas/philip/tests/2d.imageData.create2.type-expected.txt 2012-08-20 15:04:59 UTC (rev 126027)
@@ -1,2 +0,0 @@
-Failed assertion window.CanvasPixelArray !== undefined (got [undefined], expected not [undefined])
-Aborted with exception: 'undefined' is not an object (evaluating 'window.CanvasPixelArray.prototype')
Deleted: trunk/LayoutTests/platform/mac/canvas/philip/tests/2d.imageData.get.type-expected.txt (126026 => 126027)
--- trunk/LayoutTests/platform/mac/canvas/philip/tests/2d.imageData.get.type-expected.txt 2012-08-20 14:50:24 UTC (rev 126026)
+++ trunk/LayoutTests/platform/mac/canvas/philip/tests/2d.imageData.get.type-expected.txt 2012-08-20 15:04:59 UTC (rev 126027)
@@ -1,2 +0,0 @@
-Failed assertion window.CanvasPixelArray !== undefined (got [undefined], expected not [undefined])
-Aborted with exception: 'undefined' is not an object (evaluating 'window.CanvasPixelArray.prototype')
Modified: trunk/LayoutTests/platform/qt/Skipped (126026 => 126027)
--- trunk/LayoutTests/platform/qt/Skipped 2012-08-20 14:50:24 UTC (rev 126026)
+++ trunk/LayoutTests/platform/qt/Skipped 2012-08-20 15:04:59 UTC (rev 126027)
@@ -2094,9 +2094,6 @@
canvas/philip/tests/2d.gradient.radial.touch1.html
canvas/philip/tests/2d.gradient.radial.touch2.html
canvas/philip/tests/2d.gradient.radial.touch3.html
-canvas/philip/tests/2d.imageData.create1.type.html
-canvas/philip/tests/2d.imageData.create2.type.html
-canvas/philip/tests/2d.imageData.get.type.html
canvas/philip/tests/2d.imageData.object.wrap.html
canvas/philip/tests/2d.imageData.put.unchanged.html
canvas/philip/tests/2d.line.cap.open.html
