Title: [87583] trunk/LayoutTests
- Revision
- 87583
- Author
- s...@chromium.org
- Date
- 2011-05-27 16:18:07 -0700 (Fri, 27 May 2011)
Log Message
2011-05-27 Steve Lacey <s...@chromium.org>
Reviewed by Eric Carlson.
The behaviour of controls-after-reload was causing
layoutTestController in DumpRenderTree to misbehave causing a reported
failure in the test run after it (controls-css-overload).
Effectively, notifyDone() ended up getting called again after the test
was being torn down.
This change removes the unneeded seek at the end of the test (as we
should have already seeked to 0.
https://bugs.webkit.org/show_bug.cgi?id=60132
* media/controls-after-reload.html:
* platform/chromium/test_expectations.txt:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (87582 => 87583)
--- trunk/LayoutTests/ChangeLog 2011-05-27 23:09:26 UTC (rev 87582)
+++ trunk/LayoutTests/ChangeLog 2011-05-27 23:18:07 UTC (rev 87583)
@@ -1,3 +1,22 @@
+2011-05-27 Steve Lacey <s...@chromium.org>
+
+ Reviewed by Eric Carlson.
+
+ The behaviour of controls-after-reload was causing
+ layoutTestController in DumpRenderTree to misbehave causing a reported
+ failure in the test run after it (controls-css-overload).
+
+ Effectively, notifyDone() ended up getting called again after the test
+ was being torn down.
+
+ This change removes the unneeded seek at the end of the test (as we
+ should have already seeked to 0.
+
+ https://bugs.webkit.org/show_bug.cgi?id=60132
+
+ * media/controls-after-reload.html:
+ * platform/chromium/test_expectations.txt:
+
2011-05-27 Adam Klein <ad...@chromium.org>
Unreviewed. More rebaselines after r87526.
Modified: trunk/LayoutTests/media/controls-after-reload.html (87582 => 87583)
--- trunk/LayoutTests/media/controls-after-reload.html 2011-05-27 23:09:26 UTC (rev 87582)
+++ trunk/LayoutTests/media/controls-after-reload.html 2011-05-27 23:18:07 UTC (rev 87583)
@@ -3,21 +3,22 @@
<script src=""
<script>
var video;
- var loadedCount = 0;
if (window.layoutTestController)
layoutTestController.waitUntilDone();
function finish()
{
- video.pause();
- video.currentTime = 0;
+ video.removeEventListener("seeked", finish);
+
if (window.layoutTestController)
layoutTestController.notifyDone();
}
function playing()
{
+ video.removeEventListener("playing", playing);
+
// Ensure that the frame is always the same in pixel result.
video.addEventListener("seeked", finish);
video.pause();
@@ -26,13 +27,11 @@
function canplaythrough()
{
- if (!loadedCount) {
- video.src = "" "content/test");
- video.load();
- video.play();
- video.addEventListener("playing", playing);
- }
- loadedCount++;
+ video.removeEventListener("canplaythrough", canplaythrough);
+
+ video.src = "" "content/test");
+ video.addEventListener("playing", playing);
+ video.play();
}
function test()
@@ -41,7 +40,6 @@
video.addEventListener("canplaythrough", canplaythrough);
video.src = "" "content/counting");
- video.load();
}
</script>
</head>
Modified: trunk/LayoutTests/platform/chromium/test_expectations.txt (87582 => 87583)
--- trunk/LayoutTests/platform/chromium/test_expectations.txt 2011-05-27 23:09:26 UTC (rev 87582)
+++ trunk/LayoutTests/platform/chromium/test_expectations.txt 2011-05-27 23:18:07 UTC (rev 87583)
@@ -3632,7 +3632,6 @@
// webkit roll : 84350:84431
BUGDPRANKE MAC LINUX : transitions/interrupt-zero-duration.html = TEXT PASS
-BUGWK60132 BUGCR80771 : media/controls-css-overload.html = TIMEOUT PASS
BUGDPRANKE WIN LINUX : animations/change-one-anim.html = TEXT PASS
// pulled in from downstream during webkit roll 84350:84431
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
