| Index: LayoutTests/fast/media/media-query-list-listener.html
|
| diff --git a/LayoutTests/fast/media/media-query-list-listener.html b/LayoutTests/fast/media/media-query-list-listener.html
|
| index df631f84cd818e410b5598a9a9a8e65d980be8be..fb348f3ca8b9136e4b8cc36abe3f06f6e3d7ef80 100644
|
| --- a/LayoutTests/fast/media/media-query-list-listener.html
|
| +++ b/LayoutTests/fast/media/media-query-list-listener.html
|
| @@ -5,7 +5,9 @@
|
|
|
| <script>
|
| description("Media query listeners should fire on changes to matches status.");
|
| - var jsTestIsAsync = true;
|
| +
|
| + if (window.testRunner)
|
| + testRunner.dumpAsText();
|
|
|
| var sandbox = document.getElementById("sandbox");
|
| var iframe = document.createElement("iframe");
|
| @@ -15,47 +17,36 @@
|
| var mediaList = matchMedia("(max-width: 100px)");
|
| var expectedValue = "";
|
|
|
| - var tests = [];
|
| - var currentTest = 0;
|
| - function runNextTest() {
|
| - tests[currentTest++]();
|
| - }
|
| function listener(list) {
|
| window.mediaListArgument = list;
|
| shouldBe("mediaList", "mediaListArgument");
|
| shouldBe("mediaList.matches", expectedValue);
|
| - runNextTest();
|
| }
|
|
|
| mediaList.addListener(listener);
|
|
|
| shouldBe("mediaList.matches", "true");
|
|
|
| + // FIXME: You shouldn't need to touch offsetTop to force these updates.
|
| +
|
| // Should fire.
|
| iframe.style.width = "200px";
|
| expectedValue = "false";
|
| + iframe.offsetTop;
|
|
|
| - tests.push(function() {
|
| - // Should not fire.
|
| - iframe.style.width = "250px";
|
| - expectedValue = "false";
|
| + // Should not fire.
|
| + iframe.style.width = "250px";
|
| + expectedValue = "false";
|
| + iframe.offsetTop;
|
|
|
| - setTimeout(runNextTest, 20);
|
| - });
|
| + // Should fire.
|
| + iframe.style.width = "80px";
|
| + expectedValue = "true";
|
| + iframe.offsetTop;
|
|
|
| - tests.push(function() {
|
| - // Should fire.
|
| - iframe.style.width = "80px";
|
| - expectedValue = "true";
|
| - });
|
| -
|
| - tests.push(function() {
|
| - // Should not fire.
|
| - mediaList.removeListener(listener);
|
| - iframe.style.width = "200px";
|
| - iframe.offsetTop;
|
| - shouldBe("mediaList.matches", "false");
|
| -
|
| - setTimeout(finishJSTest, 20);
|
| - });
|
| + // Should not fire.
|
| + mediaList.removeListener(listener);
|
| + iframe.style.width = "200px";
|
| + iframe.offsetTop;
|
| + shouldBe("mediaList.matches", "false");
|
| </script>
|
|
|