Update canvas tests that are using CanvasPixelArray
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 20 Aug 2012 15:04:59 +0000 (15:04 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 20 Aug 2012 15:04:59 +0000 (15:04 +0000)
https://bugs.webkit.org/show_bug.cgi?id=94474

Patch by Thiago Marcos P. Santos <thiago.santos@intel.com> on 2012-08-20
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:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@126027 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog
LayoutTests/canvas/philip/tests/2d.imageData.create1.type.html
LayoutTests/canvas/philip/tests/2d.imageData.create2.type.html
LayoutTests/canvas/philip/tests/2d.imageData.get.type.html
LayoutTests/platform/chromium/TestExpectations
LayoutTests/platform/efl/Skipped
LayoutTests/platform/gtk/TestExpectations
LayoutTests/platform/mac/canvas/philip/tests/2d.imageData.create1.type-expected.txt [deleted file]
LayoutTests/platform/mac/canvas/philip/tests/2d.imageData.create2.type-expected.txt [deleted file]
LayoutTests/platform/mac/canvas/philip/tests/2d.imageData.get.type-expected.txt [deleted file]
LayoutTests/platform/qt/Skipped

index a4afe52..d8a0ad4 100644 (file)
@@ -1,3 +1,25 @@
+2012-08-20  Thiago Marcos P. Santos  <thiago.santos@intel.com>
+
+        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  <allan.jensen@nokia.com>
 
         [TouchAdjustment] Adjust to word or selection
index 9a2faf8..4f81597 100644 (file)
 _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");
 
 
 });
index d8fb21c..e8a583b 100644 (file)
 _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");
 
 
 });
index b773aec..3a92d79 100644 (file)
 _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");
 
 
 });
index ae4f245..4af4bfe 100644 (file)
@@ -1865,13 +1865,6 @@ BUGCR43890 WIN : http/tests/loading/basic.html = PASS TEXT
 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
index 5456ccc..c77fa36 100644 (file)
@@ -308,9 +308,6 @@ canvas/philip/tests/2d.drawImage.image.incomplete.omitted.html
 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
index e2c0127..5441cd8 100644 (file)
@@ -909,9 +909,6 @@ BUGWKGTK : canvas/philip/tests/2d.drawImage.image.incomplete.omitted.html = TEXT
 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
diff --git a/LayoutTests/platform/mac/canvas/philip/tests/2d.imageData.create1.type-expected.txt b/LayoutTests/platform/mac/canvas/philip/tests/2d.imageData.create1.type-expected.txt
deleted file mode 100644 (file)
index 05e639c..0000000
+++ /dev/null
@@ -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')
diff --git a/LayoutTests/platform/mac/canvas/philip/tests/2d.imageData.create2.type-expected.txt b/LayoutTests/platform/mac/canvas/philip/tests/2d.imageData.create2.type-expected.txt
deleted file mode 100644 (file)
index 05e639c..0000000
+++ /dev/null
@@ -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')
diff --git a/LayoutTests/platform/mac/canvas/philip/tests/2d.imageData.get.type-expected.txt b/LayoutTests/platform/mac/canvas/philip/tests/2d.imageData.get.type-expected.txt
deleted file mode 100644 (file)
index 05e639c..0000000
+++ /dev/null
@@ -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')
index afb43d3..c841737 100644 (file)
@@ -2094,9 +2094,6 @@ canvas/philip/tests/2d.gradient.radial.cone.top.html
 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