Diff
Modified: trunk/LayoutTests/ChangeLog (126086 => 126087)
--- trunk/LayoutTests/ChangeLog 2012-08-20 23:18:17 UTC (rev 126086)
+++ trunk/LayoutTests/ChangeLog 2012-08-20 23:25:29 UTC (rev 126087)
@@ -1,3 +1,20 @@
+2012-08-20 Dominik Röttsches <[email protected]>
+
+ 2d.imageData.object.wrap.html has wrong expectations
+ https://bugs.webkit.org/show_bug.cgi?id=94089
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ Updating and renaming the test to match new version in W3C approved tests.
+
+ * canvas/philip/tests/2d.imageData.object.clamp-expected.txt: Renamed from LayoutTests/canvas/philip/tests/2d.imageData.object.wrap-expected.txt.
+ * canvas/philip/tests/2d.imageData.object.clamp.html: Renamed from LayoutTests/canvas/philip/tests/2d.imageData.object.wrap.html.
+ * platform/chromium/TestExpectations: Unskipping.
+ * platform/efl/Skipped: Unskipping.
+ * platform/gtk/TestExpectations: Unskipping.
+ * platform/mac/Skipped: Unskipping.
+ * platform/qt/Skipped: Unskipping.
+
2012-08-20 Dirk Schulze <[email protected]>
CSS Masking and CSS Filters applied in wrong order
Copied: trunk/LayoutTests/canvas/philip/tests/2d.imageData.object.clamp-expected.txt (from rev 126086, trunk/LayoutTests/canvas/philip/tests/2d.imageData.object.wrap-expected.txt) (0 => 126087)
--- trunk/LayoutTests/canvas/philip/tests/2d.imageData.object.clamp-expected.txt (rev 0)
+++ trunk/LayoutTests/canvas/philip/tests/2d.imageData.object.clamp-expected.txt 2012-08-20 23:25:29 UTC (rev 126087)
@@ -0,0 +1 @@
+Passed
Copied: trunk/LayoutTests/canvas/philip/tests/2d.imageData.object.clamp.html (from rev 126086, trunk/LayoutTests/canvas/philip/tests/2d.imageData.object.wrap.html) (0 => 126087)
--- trunk/LayoutTests/canvas/philip/tests/2d.imageData.object.clamp.html (rev 0)
+++ trunk/LayoutTests/canvas/philip/tests/2d.imageData.object.clamp.html 2012-08-20 23:25:29 UTC (rev 126087)
@@ -0,0 +1,48 @@
+<!DOCTYPE html>
+<title>Canvas test: 2d.imageData.object.wrap</title>
+<script src=""
+<link rel="stylesheet" href=""
+<body>
+<p id="passtext">Pass</p>
+<p id="failtext">Fail</p>
+<p class="output">These images should be identical:</p>
+<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+
+<ul id="d"></ul>
+<script>
+_addTest(function(canvas, ctx) {
+
+var imgdata = ctx.getImageData(0, 0, 10, 10);
+
+imgdata.data[0] = 100;
+imgdata.data[0] = 300;
+_assertSame(imgdata.data[0], 255, "imgdata.data[\""+(0)+"\"]", "255");
+imgdata.data[0] = 100;
+imgdata.data[0] = -100;
+_assertSame(imgdata.data[0], 0, "imgdata.data[\""+(0)+"\"]", "0");
+
+imgdata.data[0] = 100;
+imgdata.data[0] = 200+Math.pow(2, 32);
+_assertSame(imgdata.data[0], 255, "imgdata.data[\""+(0)+"\"]", "255");
+imgdata.data[0] = 100;
+imgdata.data[0] = -200-Math.pow(2, 32);
+_assertSame(imgdata.data[0], 0, "imgdata.data[\""+(0)+"\"]", "0");
+
+imgdata.data[0] = 100;
+imgdata.data[0] = Math.pow(10, 39);
+_assertSame(imgdata.data[0], 255, "imgdata.data[\""+(0)+"\"]", "255");
+imgdata.data[0] = 100;
+imgdata.data[0] = -Math.pow(10, 39);
+_assertSame(imgdata.data[0], 0, "imgdata.data[\""+(0)+"\"]", "0");
+
+imgdata.data[0] = 100;
+imgdata.data[0] = -Infinity;
+_assertSame(imgdata.data[0], 0, "imgdata.data[\""+(0)+"\"]", "0");
+imgdata.data[0] = 100;
+imgdata.data[0] = Infinity;
+_assertSame(imgdata.data[0], 255, "imgdata.data[\""+(0)+"\"]", "255");
+
+
+});
+</script>
+
Deleted: trunk/LayoutTests/canvas/philip/tests/2d.imageData.object.wrap-expected.txt (126086 => 126087)
--- trunk/LayoutTests/canvas/philip/tests/2d.imageData.object.wrap-expected.txt 2012-08-20 23:18:17 UTC (rev 126086)
+++ trunk/LayoutTests/canvas/philip/tests/2d.imageData.object.wrap-expected.txt 2012-08-20 23:25:29 UTC (rev 126087)
@@ -1 +0,0 @@
-Passed
Deleted: trunk/LayoutTests/canvas/philip/tests/2d.imageData.object.wrap.html (126086 => 126087)
--- trunk/LayoutTests/canvas/philip/tests/2d.imageData.object.wrap.html 2012-08-20 23:18:17 UTC (rev 126086)
+++ trunk/LayoutTests/canvas/philip/tests/2d.imageData.object.wrap.html 2012-08-20 23:25:29 UTC (rev 126087)
@@ -1,37 +0,0 @@
-<!DOCTYPE html>
-<title>Canvas test: 2d.imageData.object.wrap</title>
-<script src=""
-<link rel="stylesheet" href=""
-<body>
-<p id="passtext">Pass</p>
-<p id="failtext">Fail</p>
-<p class="output">These images should be identical:</p>
-<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-
-<ul id="d"></ul>
-<script>
-_addTest(function(canvas, ctx) {
-
-var imgdata = ctx.getImageData(0, 0, 10, 10);
-
-imgdata.data[0] = 0;
-_assertSame(imgdata.data[0], 0, "imgdata.data[\""+(0)+"\"]", "0");
-imgdata.data[0] = 300;
-_assertSame(imgdata.data[0], 44, "imgdata.data[\""+(0)+"\"]", "44");
-imgdata.data[0] = -100;
-_assertSame(imgdata.data[0], 156, "imgdata.data[\""+(0)+"\"]", "156");
-
-imgdata.data[0] = 200+Math.pow(2, 32);
-_assertSame(imgdata.data[0], 200, "imgdata.data[\""+(0)+"\"]", "200");
-imgdata.data[0] = -200-Math.pow(2, 32);
-_assertSame(imgdata.data[0], 56, "imgdata.data[\""+(0)+"\"]", "56");
-
-imgdata.data[0] = -Infinity;
-_assertSame(imgdata.data[0], 0, "imgdata.data[\""+(0)+"\"]", "0");
-imgdata.data[0] = Infinity;
-_assertSame(imgdata.data[0], 0, "imgdata.data[\""+(0)+"\"]", "0");
-
-
-});
-</script>
-
Modified: trunk/LayoutTests/platform/chromium/TestExpectations (126086 => 126087)
--- trunk/LayoutTests/platform/chromium/TestExpectations 2012-08-20 23:18:17 UTC (rev 126086)
+++ trunk/LayoutTests/platform/chromium/TestExpectations 2012-08-20 23:25:29 UTC (rev 126087)
@@ -1871,9 +1871,6 @@
BUGWK94246 : fast/canvas/canvas-ImageData-behaviour.html = TEXT
BUGWK94246 : platform/chromium/virtual/gpu/fast/canvas/canvas-ImageData-behaviour.html = TEXT
-BUGWK94089 : canvas/philip/tests/2d.imageData.object.wrap.html = TEXT
-BUGWK94089 : platform/chromium/virtual/gpu/canvas/philip/tests/2d.imageData.object.wrap.html = TEXT
-
BUGWK45991 : canvas/philip/tests/2d.pattern.image.broken.html = TEXT
BUGWK45991 : platform/chromium/virtual/gpu/canvas/philip/tests/2d.pattern.image.broken.html = TEXT
BUGWK45991 LINUX WIN : canvas/philip/tests/2d.text.draw.baseline.ideographic.html = TEXT
Modified: trunk/LayoutTests/platform/efl/TestExpectations (126086 => 126087)
--- trunk/LayoutTests/platform/efl/TestExpectations 2012-08-20 23:18:17 UTC (rev 126086)
+++ trunk/LayoutTests/platform/efl/TestExpectations 2012-08-20 23:25:29 UTC (rev 126087)
@@ -911,5 +911,3 @@
// Slider thumb can not be displayed without parent slider.
BUGWK94334 : fast/forms/range/thumbslider-no-parent-slider.html = MISSING
-
-BUGWK94089 : canvas/philip/tests/2d.imageData.object.wrap.html = TEXT
Modified: trunk/LayoutTests/platform/gtk/TestExpectations (126086 => 126087)
--- trunk/LayoutTests/platform/gtk/TestExpectations 2012-08-20 23:18:17 UTC (rev 126086)
+++ trunk/LayoutTests/platform/gtk/TestExpectations 2012-08-20 23:25:29 UTC (rev 126087)
@@ -1013,8 +1013,6 @@
// DRT does not obey testRunner.addURLToRedirect()
BUGWKGTK : http/tests/loading/cross-origin-XHR-willLoadRequest.html = TEXT
-BUGWK94089 : canvas/philip/tests/2d.imageData.object.wrap.html = TEXT
-
// See also https://bugs.webkit.org/show_bug.cgi?id=54926
BUGWK53707 : http/tests/security/xss-DENIED-xsl-document-redirect.xml = TEXT
BUGWK53707 : http/tests/security/xss-DENIED-xsl-external-entity-redirect.xml = TEXT
Modified: trunk/LayoutTests/platform/mac/Skipped (126086 => 126087)
--- trunk/LayoutTests/platform/mac/Skipped 2012-08-20 23:18:17 UTC (rev 126086)
+++ trunk/LayoutTests/platform/mac/Skipped 2012-08-20 23:25:29 UTC (rev 126087)
@@ -167,7 +167,6 @@
# drawing model being different than the spec's current model. There is a current
# effort out to change the spec to the webkit canvas model.
canvas/philip/tests/2d.composite.operation.darker.html
-canvas/philip/tests/2d.imageData.object.wrap.html
# This canvas test is skipped because it is out of date with respect to
# the current spec, and the fix for https://bugs.webkit.org/show_bug.cgi?id=65709
Modified: trunk/LayoutTests/platform/qt/Skipped (126086 => 126087)
--- trunk/LayoutTests/platform/qt/Skipped 2012-08-20 23:18:17 UTC (rev 126086)
+++ trunk/LayoutTests/platform/qt/Skipped 2012-08-20 23:25:29 UTC (rev 126087)
@@ -2094,7 +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.object.wrap.html
canvas/philip/tests/2d.imageData.put.unchanged.html
canvas/philip/tests/2d.line.cap.open.html
canvas/philip/tests/2d.line.join.open.html
