Modified: trunk/LayoutTests/fast/canvas/webgl/gl-teximage-expected.txt (125098 => 125099)
--- trunk/LayoutTests/fast/canvas/webgl/gl-teximage-expected.txt 2012-08-08 22:12:39 UTC (rev 125098)
+++ trunk/LayoutTests/fast/canvas/webgl/gl-teximage-expected.txt 2012-08-08 22:13:19 UTC (rev 125099)
@@ -48,19 +48,19 @@
check pixels are UN pre-multiplied
PASS getError was expected value: NO_ERROR : Should be no errors from setup.
-PASS Half the pixels in channel 0 should be >= 128,128,128. found 49%
-PASS Half the pixels in channel 0 should be < 128,128,128. found 51%
-PASS Half the pixels in channel 1 should be >= 128,128,128. found 49%
-PASS Half the pixels in channel 1 should be < 128,128,128. found 51%
-PASS Half the pixels in channel 2 should be >= 128,128,128. found 49%
-PASS Half the pixels in channel 2 should be < 128,128,128. found 51%
+PASS Half the pixels in channel 0 should be >= 128,128,128.
+PASS Half the pixels in channel 0 should be < 128,128,128.
+PASS Half the pixels in channel 1 should be >= 128,128,128.
+PASS Half the pixels in channel 1 should be < 128,128,128.
+PASS Half the pixels in channel 2 should be >= 128,128,128.
+PASS Half the pixels in channel 2 should be < 128,128,128.
PASS getError was expected value: NO_ERROR : Should be no errors from setup.
-PASS Half the pixels in channel 0 should be >= 128,128,128. found 50%
-PASS Half the pixels in channel 0 should be < 128,128,128. found 50%
-PASS Half the pixels in channel 1 should be >= 128,128,128. found 50%
-PASS Half the pixels in channel 1 should be < 128,128,128. found 50%
-PASS Half the pixels in channel 2 should be >= 128,128,128. found 50%
-PASS Half the pixels in channel 2 should be < 128,128,128. found 50%
+PASS Half the pixels in channel 0 should be >= 128,128,128.
+PASS Half the pixels in channel 0 should be < 128,128,128.
+PASS Half the pixels in channel 1 should be >= 128,128,128.
+PASS Half the pixels in channel 1 should be < 128,128,128.
+PASS Half the pixels in channel 2 should be >= 128,128,128.
+PASS Half the pixels in channel 2 should be < 128,128,128.
check canvas pixels are UN pre-multiplied
PASS getError was expected value: NO_ERROR : Should be no errors from setup.
Modified: trunk/LayoutTests/fast/canvas/webgl/gl-teximage.html (125098 => 125099)
--- trunk/LayoutTests/fast/canvas/webgl/gl-teximage.html 2012-08-08 22:12:39 UTC (rev 125098)
+++ trunk/LayoutTests/fast/canvas/webgl/gl-teximage.html 2012-08-08 22:13:19 UTC (rev 125099)
@@ -238,14 +238,19 @@
// Not sure the exact count here because gamma does effect drawing into the
// canvas but it should be close to 50% so I'll pass 45%
for (var jj = 0; jj < 3; ++jj) {
+ // Only display the actual percentage string when outside of the test
+ // harness, to prevent safe variation from causing failures.
+ var inDumpRenderTree = window.testRunner;
assertMsg(ge128Count[jj] > 256 * 0.45,
"Half the pixels in channel " + jj +
- " should be >= 128,128,128. found " +
- ((ge128Count[jj] / 256) * 100).toFixed() + "%");
+ " should be >= 128,128,128. " +
+ (!inDumpRenderTree ? "found " +
+ ((ge128Count[jj] / 256) * 100).toFixed() + "%" : ""));
assertMsg(lt128Count[jj] > 256 * 0.45,
"Half the pixels in channel " + jj +
- " should be < 128,128,128. found " +
- ((lt128Count[jj] / 256) * 100).toFixed() + "%");
+ " should be < 128,128,128. " +
+ (!inDumpRenderTree ? "found " +
+ ((lt128Count[jj] / 256) * 100).toFixed() + "%" : ""));
}
}
@@ -399,4 +404,3 @@
</script>
</body>
</html>
-
Modified: trunk/LayoutTests/platform/chromium/TestExpectations (125098 => 125099)
--- trunk/LayoutTests/platform/chromium/TestExpectations 2012-08-08 22:12:39 UTC (rev 125098)
+++ trunk/LayoutTests/platform/chromium/TestExpectations 2012-08-08 22:13:19 UTC (rev 125099)
@@ -2264,7 +2264,6 @@
// GPU
/////////////////////////////////////////////////////////////////////////////
-BUGWK89494 : platform/chromium/virtual/gpu/fast/canvas/webgl/gl-teximage.html = TEXT
BUGWK47923 : compositing/geometry/limit-layer-bounds-opacity-transition.html = TIMEOUT
Modified: trunk/LayoutTests/platform/efl/TestExpectations (125098 => 125099)
--- trunk/LayoutTests/platform/efl/TestExpectations 2012-08-08 22:12:39 UTC (rev 125098)
+++ trunk/LayoutTests/platform/efl/TestExpectations 2012-08-08 22:13:19 UTC (rev 125099)
@@ -853,8 +853,8 @@
// Require rebaseline after bug 93148
BUGWK93148 : tables/mozilla_expected_failures/bugs/bug106966.html = TEXT
-BUGWK93148 : tables/mozilla_expected_failures/marvin/table_overflow_hidden_tbody.html = TEXT
-BUGWK93148 : tables/mozilla_expected_failures/marvin/table_overflow_hidden_tr.html = TEXT
+BUGWK93148 : tables/mozilla_expected_failures/marvin/table_overflow_hidden_tbody.html = TEXT
+BUGWK93148 : tables/mozilla_expected_failures/marvin/table_overflow_hidden_tr.html = TEXT
BUGWK93148 : fast/css/nested-layers-with-hover.html = TEXT
BUGWK92956 : http/tests/security/contentSecurityPolicy/object-src-url-blocked.html = TEXT
Modified: trunk/LayoutTests/platform/mac/TestExpectations (125098 => 125099)
--- trunk/LayoutTests/platform/mac/TestExpectations 2012-08-08 22:12:39 UTC (rev 125098)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2012-08-08 22:13:19 UTC (rev 125099)
@@ -317,8 +317,8 @@
// Require rebaseline after bug 93148
BUGWK93148 : tables/mozilla_expected_failures/bugs/bug106966.html = TEXT
-BUGWK93148 : tables/mozilla_expected_failures/marvin/table_overflow_hidden_tbody.html = TEXT
-BUGWK93148 : tables/mozilla_expected_failures/marvin/table_overflow_hidden_tr.html = TEXT
+BUGWK93148 : tables/mozilla_expected_failures/marvin/table_overflow_hidden_tbody.html = TEXT
+BUGWK93148 : tables/mozilla_expected_failures/marvin/table_overflow_hidden_tr.html = TEXT
BUGWK93148 : fast/css/nested-layers-with-hover.html = TEXT
BUGWK93247 DEBUG : fast/lists/list-marker-remove-crash.html = CRASH
