Diff
Modified: trunk/LayoutTests/ChangeLog (227959 => 227960)
--- trunk/LayoutTests/ChangeLog 2018-02-01 11:50:47 UTC (rev 227959)
+++ trunk/LayoutTests/ChangeLog 2018-02-01 13:38:01 UTC (rev 227960)
@@ -1,3 +1,31 @@
+2018-02-01 Antoine Quint <[email protected]>
+
+ [Modern Media Controls] Turn media/modern-media-controls/media-controls back on
+ https://bugs.webkit.org/show_bug.cgi?id=182377
+
+ Reviewed by Dean Jackson.
+
+ Update tests to match the modern-media-controls design and expectations, moving 3 tests under
+ media/modern-media-controls/macos-inline-media-controls since they are testing functionality
+ that is now specific to inline media controls.
+
+ * media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-bar-always-ltr-expected.txt: Renamed from LayoutTests/media/modern-media-controls/media-controls/media-controls-controls-bar-always-ltr-expected.txt.
+ * media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-bar-always-ltr.html: Renamed from LayoutTests/media/modern-media-controls/media-controls/media-controls-controls-bar-always-ltr.html.
+ * media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-placard-expected.txt: Added.
+ * media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-placard.html: Added.
+ * media/modern-media-controls/macos-inline-media-controls/macos-inline-media-shows-start-button-expected.txt: Renamed from LayoutTests/media/modern-media-controls/media-controls/media-controls-start-button-expected.txt.
+ * media/modern-media-controls/macos-inline-media-controls/macos-inline-media-shows-start-button.html: Renamed from LayoutTests/media/modern-media-controls/media-controls/media-controls-start-button.html.
+ * media/modern-media-controls/media-controls/media-controls-appear-when-focus-expected.txt:
+ * media/modern-media-controls/media-controls/media-controls-appear-when-focus.html:
+ * media/modern-media-controls/media-controls/media-controls-constructor-expected.txt:
+ * media/modern-media-controls/media-controls/media-controls-constructor.html:
+ * media/modern-media-controls/media-controls/media-controls-placard-compressed-metrics-expected.txt:
+ * media/modern-media-controls/media-controls/media-controls-placard-compressed-metrics.html:
+ * media/modern-media-controls/media-controls/media-controls-placard-expected.txt: Removed.
+ * media/modern-media-controls/media-controls/media-controls-placard.html: Removed.
+ * platform/ios/TestExpectations:
+ * platform/mac/TestExpectations:
+
2018-02-01 Ms2ger <[email protected]>
Update imagebitmap tests.
Copied: trunk/LayoutTests/media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-bar-always-ltr-expected.txt (from rev 227959, trunk/LayoutTests/media/modern-media-controls/media-controls/media-controls-controls-bar-always-ltr-expected.txt) (0 => 227960)
--- trunk/LayoutTests/media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-bar-always-ltr-expected.txt (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-bar-always-ltr-expected.txt 2018-02-01 13:38:01 UTC (rev 227960)
@@ -0,0 +1,10 @@
+Testing that the controls bar enforces left-to-right layout.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS getComputedStyle(mediaControls.bottomControlsBar.element).direction became "ltr"
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
Copied: trunk/LayoutTests/media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-bar-always-ltr.html (from rev 227959, trunk/LayoutTests/media/modern-media-controls/media-controls/media-controls-controls-bar-always-ltr.html) (0 => 227960)
--- trunk/LayoutTests/media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-bar-always-ltr.html (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-bar-always-ltr.html 2018-02-01 13:38:01 UTC (rev 227960)
@@ -0,0 +1,23 @@
+<script src=""
+<script src="" type="text/_javascript_"></script>
+<body>
+<script type="text/_javascript_">
+
+window.jsTestIsAsync = true;
+
+description("Testing that the controls bar enforces left-to-right layout.");
+
+const mediaControls = new MacOSInlineMediaControls;
+
+// Add the media controls and set the direction to be RTL.
+document.body.appendChild(mediaControls.element).style.direction = "rtl";
+
+// Ensure that the controls bar itself enforces an LTR direction.
+shouldBecomeEqualToString("getComputedStyle(mediaControls.bottomControlsBar.element).direction", "ltr", () => {
+ mediaControls.element.remove();
+ finishJSTest();
+});
+
+</script>
+<script src=""
+</body>
Added: trunk/LayoutTests/media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-placard-expected.txt (0 => 227960)
--- trunk/LayoutTests/media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-placard-expected.txt (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-placard-expected.txt 2018-02-01 13:38:01 UTC (rev 227960)
@@ -0,0 +1,29 @@
+Testing the MacOSInlineMediaControls handling of placards.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+By default, no placard is shown.
+PASS mediaControls.placard is null
+PASS mediaControls.children is [mediaControls.topLeftControlsBar, mediaControls.bottomControlsBar]
+
+Showing the Airplay placard
+PASS mediaControls.placard is mediaControls.airplayPlacard
+PASS mediaControls.children is [mediaControls.airplayPlacard, mediaControls.topLeftControlsBar, mediaControls.bottomControlsBar]
+
+Showing the Invalid placard, hides the controls bar
+PASS mediaControls.placard is mediaControls.invalidPlacard
+PASS mediaControls.children is [mediaControls.invalidPlacard]
+
+Showing the PiP placard, hides the controls bar
+PASS mediaControls.placard is mediaControls.pipPlacard
+PASS mediaControls.children is [mediaControls.pipPlacard]
+
+Hide placard
+PASS mediaControls.placard is null
+PASS mediaControls.children is [mediaControls.topLeftControlsBar, mediaControls.bottomControlsBar]
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
Added: trunk/LayoutTests/media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-placard.html (0 => 227960)
--- trunk/LayoutTests/media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-placard.html (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-placard.html 2018-02-01 13:38:01 UTC (rev 227960)
@@ -0,0 +1,42 @@
+<script src=""
+<script src="" type="text/_javascript_"></script>
+<body>
+<script type="text/_javascript_">
+
+description("Testing the <code>MacOSInlineMediaControls</code> handling of placards.");
+
+const mediaControls = new MacOSInlineMediaControls;
+
+debug("By default, no placard is shown.");
+shouldBeNull("mediaControls.placard");
+shouldBe("mediaControls.children", "[mediaControls.topLeftControlsBar, mediaControls.bottomControlsBar]");
+
+debug("");
+debug("Showing the Airplay placard");
+mediaControls.placard = mediaControls.airplayPlacard;
+shouldBe("mediaControls.placard", "mediaControls.airplayPlacard");
+shouldBe("mediaControls.children", "[mediaControls.airplayPlacard, mediaControls.topLeftControlsBar, mediaControls.bottomControlsBar]");
+
+debug("");
+debug("Showing the Invalid placard, hides the controls bar");
+mediaControls.placard = mediaControls.invalidPlacard;
+shouldBe("mediaControls.placard", "mediaControls.invalidPlacard");
+shouldBe("mediaControls.children", "[mediaControls.invalidPlacard]");
+
+debug("");
+debug("Showing the PiP placard, hides the controls bar");
+mediaControls.placard = mediaControls.pipPlacard;
+shouldBe("mediaControls.placard", "mediaControls.pipPlacard");
+shouldBe("mediaControls.children", "[mediaControls.pipPlacard]");
+
+debug("");
+debug("Hide placard");
+mediaControls.placard = null;
+shouldBeNull("mediaControls.placard");
+shouldBe("mediaControls.children", "[mediaControls.topLeftControlsBar, mediaControls.bottomControlsBar]");
+
+debug("");
+
+</script>
+<script src=""
+</body>
Copied: trunk/LayoutTests/media/modern-media-controls/macos-inline-media-controls/macos-inline-media-shows-start-button-expected.txt (from rev 227959, trunk/LayoutTests/media/modern-media-controls/media-controls/media-controls-start-button-expected.txt) (0 => 227960)
--- trunk/LayoutTests/media/modern-media-controls/macos-inline-media-controls/macos-inline-media-shows-start-button-expected.txt (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/macos-inline-media-controls/macos-inline-media-shows-start-button-expected.txt 2018-02-01 13:38:01 UTC (rev 227960)
@@ -0,0 +1,17 @@
+Testing the MacOSInlineMediaControls showsStartButton property.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Default where showsStartButton = false
+PASS mediaControls.showsStartButton is false
+PASS mediaControls.children is [mediaControls.topLeftControlsBar, mediaControls.bottomControlsBar]
+
+showsStartButton = true
+PASS mediaControls.showsStartButton is true
+PASS mediaControls.children is [mediaControls.playPauseButton]
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
Copied: trunk/LayoutTests/media/modern-media-controls/macos-inline-media-controls/macos-inline-media-shows-start-button.html (from rev 227959, trunk/LayoutTests/media/modern-media-controls/media-controls/media-controls-start-button.html) (0 => 227960)
--- trunk/LayoutTests/media/modern-media-controls/macos-inline-media-controls/macos-inline-media-shows-start-button.html (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/macos-inline-media-controls/macos-inline-media-shows-start-button.html 2018-02-01 13:38:01 UTC (rev 227960)
@@ -0,0 +1,24 @@
+<script src=""
+<script src="" type="text/_javascript_"></script>
+<body>
+<script type="text/_javascript_">
+
+description("Testing the <code>MacOSInlineMediaControls</code> showsStartButton property.");
+
+const mediaControls = new MacOSInlineMediaControls;
+
+debug("Default where showsStartButton = false");
+shouldBeFalse("mediaControls.showsStartButton");
+shouldBe("mediaControls.children", "[mediaControls.topLeftControlsBar, mediaControls.bottomControlsBar]");
+
+debug("");
+debug("showsStartButton = true");
+mediaControls.showsStartButton = true;
+shouldBeTrue("mediaControls.showsStartButton");
+shouldBe("mediaControls.children", "[mediaControls.playPauseButton]");
+
+debug("");
+
+</script>
+<script src=""
+</body>
Modified: trunk/LayoutTests/media/modern-media-controls/media-controls/media-controls-appear-when-focus-expected.txt (227959 => 227960)
--- trunk/LayoutTests/media/modern-media-controls/media-controls/media-controls-appear-when-focus-expected.txt 2018-02-01 11:50:47 UTC (rev 227959)
+++ trunk/LayoutTests/media/modern-media-controls/media-controls/media-controls-appear-when-focus-expected.txt 2018-02-01 13:38:01 UTC (rev 227960)
@@ -3,9 +3,9 @@
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-PASS mediaControls.controlsBar.faded is false
-PASS mediaControls.controlsBar.faded is true
-PASS mediaControls.controlsBar.faded is false
+PASS mediaControls.faded is false
+PASS mediaControls.faded is true
+PASS mediaControls.faded is false
PASS successfullyParsed is true
Modified: trunk/LayoutTests/media/modern-media-controls/media-controls/media-controls-appear-when-focus.html (227959 => 227960)
--- trunk/LayoutTests/media/modern-media-controls/media-controls/media-controls-appear-when-focus.html 2018-02-01 11:50:47 UTC (rev 227959)
+++ trunk/LayoutTests/media/modern-media-controls/media-controls/media-controls-appear-when-focus.html 2018-02-01 13:38:01 UTC (rev 227960)
@@ -7,12 +7,11 @@
const mediaControls = new MediaControls({ layoutTraits: LayoutTraits.macOS });
-shouldBeFalse("mediaControls.controlsBar.faded");
-mediaControls.controlsBar.faded = true;
-shouldBeTrue("mediaControls.controlsBar.faded");
-let focusin = new Event("focusin");
-mediaControls.controlsBar.element.dispatchEvent(focusin);
-shouldBeFalse("mediaControls.controlsBar.faded");
+shouldBeFalse("mediaControls.faded");
+mediaControls.faded = true;
+shouldBeTrue("mediaControls.faded");
+mediaControls.element.dispatchEvent(new Event("focusin"));
+shouldBeFalse("mediaControls.faded");
debug("");
Modified: trunk/LayoutTests/media/modern-media-controls/media-controls/media-controls-constructor-expected.txt (227959 => 227960)
--- trunk/LayoutTests/media/modern-media-controls/media-controls/media-controls-constructor-expected.txt 2018-02-01 11:50:47 UTC (rev 227959)
+++ trunk/LayoutTests/media/modern-media-controls/media-controls/media-controls-constructor-expected.txt 2018-02-01 13:38:01 UTC (rev 227960)
@@ -9,11 +9,8 @@
PASS mediaControls.width is 300
PASS mediaControls.height is 150
PASS mediaControls.layoutTraits is LayoutTraits.macOS
-PASS mediaControls.showsStartButton is false
-PASS mediaControls.startButton instanceof StartButton is true
PASS mediaControls.playPauseButton instanceof PlayPauseButton is true
-PASS mediaControls.skipBackButton instanceof SkipBackButton is true
PASS mediaControls.airplayButton instanceof AirplayButton is true
PASS mediaControls.pipButton instanceof PiPButton is true
PASS mediaControls.fullscreenButton instanceof FullscreenButton is true
@@ -23,9 +20,10 @@
PASS mediaControls.invalidPlacard instanceof InvalidPlacard is true
PASS mediaControls.pipPlacard instanceof PiPPlacard is true
-PASS mediaControls.controlsBar instanceof ControlsBar is true
-PASS mediaControls.controlsBar.element.localName is "div"
-PASS mediaControls.controlsBar.element.className is "controls-bar"
+PASS mediaControls.bottomControlsBar instanceof ControlsBar is true
+PASS mediaControls.bottomControlsBar.element.localName is "div"
+PASS mediaControls.bottomControlsBar.element.classList.contains('controls-bar') is true
+PASS mediaControls.bottomControlsBar.element.classList.contains('bottom') is true
PASS mediaControlsWithArguments.width is 600
PASS mediaControlsWithArguments.height is 300
Modified: trunk/LayoutTests/media/modern-media-controls/media-controls/media-controls-constructor.html (227959 => 227960)
--- trunk/LayoutTests/media/modern-media-controls/media-controls/media-controls-constructor.html 2018-02-01 11:50:47 UTC (rev 227959)
+++ trunk/LayoutTests/media/modern-media-controls/media-controls/media-controls-constructor.html 2018-02-01 13:38:01 UTC (rev 227960)
@@ -14,12 +14,9 @@
shouldBe("mediaControls.width", "300");
shouldBe("mediaControls.height", "150");
shouldBe("mediaControls.layoutTraits", "LayoutTraits.macOS");
-shouldBeFalse("mediaControls.showsStartButton");
debug("");
-shouldBeTrue("mediaControls.startButton instanceof StartButton");
shouldBeTrue("mediaControls.playPauseButton instanceof PlayPauseButton");
-shouldBeTrue("mediaControls.skipBackButton instanceof SkipBackButton");
shouldBeTrue("mediaControls.airplayButton instanceof AirplayButton");
shouldBeTrue("mediaControls.pipButton instanceof PiPButton");
shouldBeTrue("mediaControls.fullscreenButton instanceof FullscreenButton");
@@ -30,9 +27,10 @@
shouldBeTrue("mediaControls.pipPlacard instanceof PiPPlacard");
debug("");
-shouldBeTrue("mediaControls.controlsBar instanceof ControlsBar");
-shouldBeEqualToString("mediaControls.controlsBar.element.localName", "div");
-shouldBeEqualToString("mediaControls.controlsBar.element.className", "controls-bar");
+shouldBeTrue("mediaControls.bottomControlsBar instanceof ControlsBar");
+shouldBeEqualToString("mediaControls.bottomControlsBar.element.localName", "div");
+shouldBeTrue("mediaControls.bottomControlsBar.element.classList.contains('controls-bar')");
+shouldBeTrue("mediaControls.bottomControlsBar.element.classList.contains('bottom')");
debug("");
const mediaControlsWithArguments = new MediaControls({ width: 600, height: 300, layoutTraits: LayoutTraits.macOS });
Deleted: trunk/LayoutTests/media/modern-media-controls/media-controls/media-controls-controls-bar-always-ltr-expected.txt (227959 => 227960)
--- trunk/LayoutTests/media/modern-media-controls/media-controls/media-controls-controls-bar-always-ltr-expected.txt 2018-02-01 11:50:47 UTC (rev 227959)
+++ trunk/LayoutTests/media/modern-media-controls/media-controls/media-controls-controls-bar-always-ltr-expected.txt 2018-02-01 13:38:01 UTC (rev 227960)
@@ -1,10 +0,0 @@
-Testing that the controls bar enforces left-to-right layout.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS getComputedStyle(mediaControls.controlsBar.element).direction became "ltr"
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
Deleted: trunk/LayoutTests/media/modern-media-controls/media-controls/media-controls-controls-bar-always-ltr.html (227959 => 227960)
--- trunk/LayoutTests/media/modern-media-controls/media-controls/media-controls-controls-bar-always-ltr.html 2018-02-01 11:50:47 UTC (rev 227959)
+++ trunk/LayoutTests/media/modern-media-controls/media-controls/media-controls-controls-bar-always-ltr.html 2018-02-01 13:38:01 UTC (rev 227960)
@@ -1,20 +0,0 @@
-<script src=""
-<script src="" type="text/_javascript_"></script>
-<body>
-<script type="text/_javascript_">
-
-window.jsTestIsAsync = true;
-
-description("Testing that the controls bar enforces left-to-right layout.");
-
-const mediaControls = new MediaControls({ layoutTraits: LayoutTraits.macOS });
-
-// Add the media controls and set the direction to be RTL.
-document.body.appendChild(mediaControls.element).style.direction = "rtl";
-
-// Ensure that the controls bar itself enforces an LTR direction.
-shouldBecomeEqualToString("getComputedStyle(mediaControls.controlsBar.element).direction", "ltr", finishJSTest);
-
-</script>
-<script src=""
-</body>
Modified: trunk/LayoutTests/media/modern-media-controls/media-controls/media-controls-placard-compressed-metrics-expected.txt (227959 => 227960)
--- trunk/LayoutTests/media/modern-media-controls/media-controls/media-controls-placard-compressed-metrics-expected.txt 2018-02-01 11:50:47 UTC (rev 227959)
+++ trunk/LayoutTests/media/modern-media-controls/media-controls/media-controls-placard-compressed-metrics-expected.txt 2018-02-01 13:38:01 UTC (rev 227960)
@@ -3,9 +3,9 @@
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-mediaControls.showPlacard(mediaControls.airplayPlacard)
+mediaControls.placard = mediaControls.airplayPlacard
PASS placardContainer.children.length is 3
-PASS placardContainer.children[0] instanceof IconButton is true
+PASS placardContainer.children[0] instanceof Button is true
PASS placardContainer.children[1].element.className is "title"
PASS placardContainer.children[2].element.className is "description"
@@ -33,7 +33,7 @@
mediaControls.width = 170
mediaControls.height = 170
PASS placardContainer.children.length is 3
-PASS placardContainer.children[0] instanceof IconButton is true
+PASS placardContainer.children[0] instanceof Button is true
PASS placardContainer.children[1].element.className is "title"
PASS placardContainer.children[2].element.className is "description"
Modified: trunk/LayoutTests/media/modern-media-controls/media-controls/media-controls-placard-compressed-metrics.html (227959 => 227960)
--- trunk/LayoutTests/media/modern-media-controls/media-controls/media-controls-placard-compressed-metrics.html 2018-02-01 11:50:47 UTC (rev 227959)
+++ trunk/LayoutTests/media/modern-media-controls/media-controls/media-controls-placard-compressed-metrics.html 2018-02-01 13:38:01 UTC (rev 227960)
@@ -7,11 +7,11 @@
const mediaControls = new MediaControls({ layoutTraits: LayoutTraits.macOS, width: 400, height: 300 });
-mediaControls.showPlacard(mediaControls.airplayPlacard);
+mediaControls.placard = mediaControls.airplayPlacard;
const placardContainer = mediaControls.placard.children[0];
-debug("mediaControls.showPlacard(mediaControls.airplayPlacard)");
+debug("mediaControls.placard = mediaControls.airplayPlacard");
shouldBe("placardContainer.children.length", "3");
-shouldBeTrue("placardContainer.children[0] instanceof IconButton");
+shouldBeTrue("placardContainer.children[0] instanceof Button");
shouldBeEqualToString("placardContainer.children[1].element.className", "title");
shouldBeEqualToString("placardContainer.children[2].element.className", "description");
@@ -52,7 +52,7 @@
mediaControls.width = 170;
mediaControls.height = 170;
shouldBe("placardContainer.children.length", "3");
-shouldBeTrue("placardContainer.children[0] instanceof IconButton");
+shouldBeTrue("placardContainer.children[0] instanceof Button");
shouldBeEqualToString("placardContainer.children[1].element.className", "title");
shouldBeEqualToString("placardContainer.children[2].element.className", "description");
Deleted: trunk/LayoutTests/media/modern-media-controls/media-controls/media-controls-placard-expected.txt (227959 => 227960)
--- trunk/LayoutTests/media/modern-media-controls/media-controls/media-controls-placard-expected.txt 2018-02-01 11:50:47 UTC (rev 227959)
+++ trunk/LayoutTests/media/modern-media-controls/media-controls/media-controls-placard-expected.txt 2018-02-01 13:38:01 UTC (rev 227960)
@@ -1,29 +0,0 @@
-Testing the MediaControls handling of placards.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-By default, no placard is shown.
-PASS mediaControls.showsPlacard is false
-PASS mediaControls.children is [mediaControls.controlsBar]
-
-Showing the Airplay placard
-PASS mediaControls.showsPlacard is true
-PASS mediaControls.children is [mediaControls.airplayPlacard, mediaControls.controlsBar]
-
-Showing the Invalid placard, hides the controls bar
-PASS mediaControls.showsPlacard is true
-PASS mediaControls.children is [mediaControls.invalidPlacard]
-
-Showing the PiP placard, hides the controls bar
-PASS mediaControls.showsPlacard is true
-PASS mediaControls.children is [mediaControls.pipPlacard]
-
-Hide placard
-PASS mediaControls.showsPlacard is false
-PASS mediaControls.children is [mediaControls.controlsBar]
-
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
Deleted: trunk/LayoutTests/media/modern-media-controls/media-controls/media-controls-placard.html (227959 => 227960)
--- trunk/LayoutTests/media/modern-media-controls/media-controls/media-controls-placard.html 2018-02-01 11:50:47 UTC (rev 227959)
+++ trunk/LayoutTests/media/modern-media-controls/media-controls/media-controls-placard.html 2018-02-01 13:38:01 UTC (rev 227960)
@@ -1,42 +0,0 @@
-<script src=""
-<script src="" type="text/_javascript_"></script>
-<body>
-<script type="text/_javascript_">
-
-description("Testing the <code>MediaControls</code> handling of placards.");
-
-const mediaControls = new MediaControls({ layoutTraits: LayoutTraits.macOS });
-
-debug("By default, no placard is shown.");
-shouldBeFalse("mediaControls.showsPlacard");
-shouldBe("mediaControls.children", "[mediaControls.controlsBar]");
-
-debug("");
-debug("Showing the Airplay placard");
-mediaControls.showPlacard(mediaControls.airplayPlacard);
-shouldBeTrue("mediaControls.showsPlacard");
-shouldBe("mediaControls.children", "[mediaControls.airplayPlacard, mediaControls.controlsBar]");
-
-debug("");
-debug("Showing the Invalid placard, hides the controls bar");
-mediaControls.showPlacard(mediaControls.invalidPlacard);
-shouldBeTrue("mediaControls.showsPlacard");
-shouldBe("mediaControls.children", "[mediaControls.invalidPlacard]");
-
-debug("");
-debug("Showing the PiP placard, hides the controls bar");
-mediaControls.showPlacard(mediaControls.pipPlacard);
-shouldBeTrue("mediaControls.showsPlacard");
-shouldBe("mediaControls.children", "[mediaControls.pipPlacard]");
-
-debug("");
-debug("Hide placard");
-mediaControls.hidePlacard();
-shouldBeFalse("mediaControls.showsPlacard");
-shouldBe("mediaControls.children", "[mediaControls.controlsBar]");
-
-debug("");
-
-</script>
-<script src=""
-</body>
Deleted: trunk/LayoutTests/media/modern-media-controls/media-controls/media-controls-start-button-expected.txt (227959 => 227960)
--- trunk/LayoutTests/media/modern-media-controls/media-controls/media-controls-start-button-expected.txt 2018-02-01 11:50:47 UTC (rev 227959)
+++ trunk/LayoutTests/media/modern-media-controls/media-controls/media-controls-start-button-expected.txt 2018-02-01 13:38:01 UTC (rev 227960)
@@ -1,17 +0,0 @@
-Testing the MediaControls showsStartButton property.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-Default where showsStartButton = false
-PASS mediaControls.showsStartButton is false
-PASS mediaControls.children is [mediaControls.controlsBar]
-
-showsStartButton = true
-PASS mediaControls.showsStartButton is true
-PASS mediaControls.children is [mediaControls.startButton]
-
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
Deleted: trunk/LayoutTests/media/modern-media-controls/media-controls/media-controls-start-button.html (227959 => 227960)
--- trunk/LayoutTests/media/modern-media-controls/media-controls/media-controls-start-button.html 2018-02-01 11:50:47 UTC (rev 227959)
+++ trunk/LayoutTests/media/modern-media-controls/media-controls/media-controls-start-button.html 2018-02-01 13:38:01 UTC (rev 227960)
@@ -1,24 +0,0 @@
-<script src=""
-<script src="" type="text/_javascript_"></script>
-<body>
-<script type="text/_javascript_">
-
-description("Testing the <code>MediaControls</code> showsStartButton property.");
-
-const mediaControls = new MediaControls({ layoutTraits: LayoutTraits.macOS });
-
-debug("Default where showsStartButton = false");
-shouldBeFalse("mediaControls.showsStartButton");
-shouldBe("mediaControls.children", "[mediaControls.controlsBar]");
-
-debug("");
-debug("showsStartButton = true");
-mediaControls.showsStartButton = true;
-shouldBeTrue("mediaControls.showsStartButton");
-shouldBe("mediaControls.children", "[mediaControls.startButton]");
-
-debug("");
-
-</script>
-<script src=""
-</body>
Modified: trunk/LayoutTests/platform/ios/TestExpectations (227959 => 227960)
--- trunk/LayoutTests/platform/ios/TestExpectations 2018-02-01 11:50:47 UTC (rev 227959)
+++ trunk/LayoutTests/platform/ios/TestExpectations 2018-02-01 13:38:01 UTC (rev 227960)
@@ -3210,7 +3210,7 @@
media/modern-media-controls/layout-node [ Pass ]
media/modern-media-controls/localized-strings [ Pass ]
media/modern-media-controls/media-controller [ Pass ]
-media/modern-media-controls/media-controls/media-controls-display-above-captions.html [ Pass ]
+media/modern-media-controls/media-controls [ Pass ]
media/modern-media-controls/media-documents [ Pass ]
media/modern-media-controls/mute-button [ Pass ]
media/modern-media-controls/mute-support [ Pass ]
Modified: trunk/LayoutTests/platform/mac/TestExpectations (227959 => 227960)
--- trunk/LayoutTests/platform/mac/TestExpectations 2018-02-01 11:50:47 UTC (rev 227959)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2018-02-01 13:38:01 UTC (rev 227960)
@@ -1466,7 +1466,7 @@
media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-volume-controls-hidden-when-mute-button-disabled.html [ Pass ]
media/modern-media-controls/macos-inline-media-controls [ Pass ]
media/modern-media-controls/media-controller [ Pass ]
-media/modern-media-controls/media-controls/media-controls-display-above-captions.html [ Pass ]
+media/modern-media-controls/media-controls [ Pass ]
media/modern-media-controls/media-documents [ Pass ]
media/modern-media-controls/mute-button [ Pass ]
media/modern-media-controls/mute-support [ Pass ]
