Title: [93148] trunk/LayoutTests
- Revision
- 93148
- Author
- [email protected]
- Date
- 2011-08-16 13:13:15 -0700 (Tue, 16 Aug 2011)
Log Message
Make video-controls-no-scripting.html results platform independent.
* media/video-controls-no-scripting-expected.txt:
* media/video-controls-no-scripting.html:
* platform/chromium/media/video-controls-no-scripting-expected.txt: Removed.
Modified Paths
Removed Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (93147 => 93148)
--- trunk/LayoutTests/ChangeLog 2011-08-16 20:10:08 UTC (rev 93147)
+++ trunk/LayoutTests/ChangeLog 2011-08-16 20:13:15 UTC (rev 93148)
@@ -1,3 +1,11 @@
+2011-08-16 Eric Carlson <[email protected]>
+
+ Make video-controls-no-scripting.html results platform independent.
+
+ * media/video-controls-no-scripting-expected.txt:
+ * media/video-controls-no-scripting.html:
+ * platform/chromium/media/video-controls-no-scripting-expected.txt: Removed.
+
2011-08-16 David Hyatt <[email protected]>
https://bugs.webkit.org/show_bug.cgi?id=66254
Modified: trunk/LayoutTests/media/video-controls-no-scripting-expected.txt (93147 => 93148)
--- trunk/LayoutTests/media/video-controls-no-scripting-expected.txt 2011-08-16 20:10:08 UTC (rev 93147)
+++ trunk/LayoutTests/media/video-controls-no-scripting-expected.txt 2011-08-16 20:13:15 UTC (rev 93148)
@@ -2,7 +2,7 @@
Tests that the built-in controls are always enabled when _javascript_ is disabled.
EXPECTED (internals.shadowRoot(video) != 'null') OK
-EXPECTED (controls.offsetTop + controls.offsetHeight <= '240') OK
+EXPECTED (controls.offsetTop + controls.offsetHeight <= 'video.offsetHeight') OK
EXPECTED (getComputedStyle(controls).opacity == '1') OK
END OF TEST
Modified: trunk/LayoutTests/media/video-controls-no-scripting.html (93147 => 93148)
--- trunk/LayoutTests/media/video-controls-no-scripting.html 2011-08-16 20:10:08 UTC (rev 93147)
+++ trunk/LayoutTests/media/video-controls-no-scripting.html 2011-08-16 20:13:15 UTC (rev 93148)
@@ -13,7 +13,10 @@
video = document.getElementById("fr").contentDocument.querySelector("video");
testExpected("internals.shadowRoot(video)", null, "!=");
controls = internals.shadowRoot(video).firstChild.firstChild;
- testExpected("controls.offsetTop + controls.offsetHeight", video.offsetHeight, "<=");
+
+ // Don't use "testExpected()" for the control location because not all ports use the same size controls.
+ reportExpected((controls.offsetTop + controls.offsetHeight) <= video.offsetHeight, "controls.offsetTop + controls.offsetHeight", "<=", "video.offsetHeight", controls.offsetTop + controls.offsetHeight);
+
testExpected("getComputedStyle(controls).opacity", 1);
consoleWrite("");
Deleted: trunk/LayoutTests/platform/chromium/media/video-controls-no-scripting-expected.txt (93147 => 93148)
--- trunk/LayoutTests/platform/chromium/media/video-controls-no-scripting-expected.txt 2011-08-16 20:10:08 UTC (rev 93147)
+++ trunk/LayoutTests/platform/chromium/media/video-controls-no-scripting-expected.txt 2011-08-16 20:13:15 UTC (rev 93148)
@@ -1,9 +0,0 @@
-
-Tests that the built-in controls are always enabled when _javascript_ is disabled.
-
-EXPECTED (internals.shadowRoot(video) != 'null') OK
-EXPECTED (controls.offsetTop + controls.offsetHeight <= '150') OK
-EXPECTED (getComputedStyle(controls).opacity == '1') OK
-
-END OF TEST
-
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
