Diff
Modified: trunk/LayoutTests/ChangeLog (218239 => 218240)
--- trunk/LayoutTests/ChangeLog 2017-06-14 01:30:11 UTC (rev 218239)
+++ trunk/LayoutTests/ChangeLog 2017-06-14 02:39:02 UTC (rev 218240)
@@ -1,5 +1,17 @@
2017-06-13 Antoine Quint <grao...@apple.com>
+ Rebaseline media/modern-media-controls/mute-support
+ https://bugs.webkit.org/show_bug.cgi?id=173345
+
+ Reviewed by Dean Jackson.
+
+ * media/modern-media-controls/mute-support/mute-support-press-on-button-expected.txt: Renamed from LayoutTests/media/modern-media-controls/mute-support/mute-support-button-click-expected.txt.
+ * media/modern-media-controls/mute-support/mute-support-press-on-button.html: Renamed from LayoutTests/media/modern-media-controls/mute-support/mute-support-button-click.html.
+ * platform/ios-simulator/TestExpectations:
+ * platform/mac/TestExpectations:
+
+2017-06-13 Antoine Quint <grao...@apple.com>
+
Rebaseline media/modern-media-controls/tracks-button
https://bugs.webkit.org/show_bug.cgi?id=173220
Deleted: trunk/LayoutTests/media/modern-media-controls/mute-support/mute-support-button-click-expected.txt (218239 => 218240)
--- trunk/LayoutTests/media/modern-media-controls/mute-support/mute-support-button-click-expected.txt 2017-06-14 01:30:11 UTC (rev 218239)
+++ trunk/LayoutTests/media/modern-media-controls/mute-support/mute-support-button-click-expected.txt 2017-06-14 02:39:02 UTC (rev 218240)
@@ -1,23 +0,0 @@
-Testing the MuteSupport behavior by clicking on the mute button.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS mediaController.controls.muteButton.muted is false
-
-Dispatching click event to the mute button
-
-volumechange event was dispatched
-PASS media.muted is true
-PASS mediaController.controls.muteButton.muted is true
-
-Dispatching click event to the mute button
-
-volumechange event was dispatched
-PASS media.muted is false
-PASS mediaController.controls.muteButton.muted is false
-
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
Deleted: trunk/LayoutTests/media/modern-media-controls/mute-support/mute-support-button-click.html (218239 => 218240)
--- trunk/LayoutTests/media/modern-media-controls/mute-support/mute-support-button-click.html 2017-06-14 01:30:11 UTC (rev 218239)
+++ trunk/LayoutTests/media/modern-media-controls/mute-support/mute-support-button-click.html 2017-06-14 02:39:02 UTC (rev 218240)
@@ -1,50 +0,0 @@
-<script src=""
-<script src="" type="text/_javascript_"></script>
-<body>
-<video src="" style="width: 320px; height: 240px;"></video>
-<div id="shadow"></div>
-<script type="text/_javascript_">
-
-window.jsTestIsAsync = true;
-
-description("Testing the <code>MuteSupport</code> behavior by clicking on the mute button.");
-
-const shadowRoot = document.querySelector("div#shadow").attachShadow({ mode: "open" });
-const media = document.querySelector("video");
-const mediaController = createControls(shadowRoot, media, null);
-
-shouldBeFalse("mediaController.controls.muteButton.muted");
-
-let numberOfEvents = 0;
-media.addEventListener("volumechange", function() {
- debug("");
- debug("volumechange event was dispatched");
-
- numberOfEvents++;
-
- if (numberOfEvents == 1) {
- shouldBeTrue("media.muted");
- shouldBeTrue("mediaController.controls.muteButton.muted");
- clickMuteButton();
- } else if (numberOfEvents == 2) {
- shouldBeFalse("media.muted");
- shouldBeFalse("mediaController.controls.muteButton.muted");
- debug("");
- shadowRoot.host.remove();
- media.remove();
- finishJSTest();
- }
-});
-
-function clickMuteButton()
-{
- debug("");
- debug("Dispatching click event to the mute button");
- mediaController.controls.muteButton.element.click();
-}
-
-clickMuteButton();
-
-</script>
-<script src=""
-</body>
Copied: trunk/LayoutTests/media/modern-media-controls/mute-support/mute-support-press-on-button-expected.txt (from rev 218239, trunk/LayoutTests/media/modern-media-controls/mute-support/mute-support-button-click-expected.txt) (0 => 218240)
--- trunk/LayoutTests/media/modern-media-controls/mute-support/mute-support-press-on-button-expected.txt (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/mute-support/mute-support-press-on-button-expected.txt 2017-06-14 02:39:02 UTC (rev 218240)
@@ -0,0 +1,23 @@
+Testing the MuteSupport behavior by clicking on the mute button.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS mediaController.controls.muteButton.muted is false
+
+Pressing the mute button
+
+volumechange event was dispatched
+PASS media.muted is true
+PASS mediaController.controls.muteButton.muted is true
+
+Pressing the mute button
+
+volumechange event was dispatched
+PASS media.muted is false
+PASS mediaController.controls.muteButton.muted is false
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
Copied: trunk/LayoutTests/media/modern-media-controls/mute-support/mute-support-press-on-button.html (from rev 218239, trunk/LayoutTests/media/modern-media-controls/mute-support/mute-support-button-click.html) (0 => 218240)
--- trunk/LayoutTests/media/modern-media-controls/mute-support/mute-support-press-on-button.html (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/mute-support/mute-support-press-on-button.html 2017-06-14 02:39:02 UTC (rev 218240)
@@ -0,0 +1,65 @@
+<script src=""
+<script src="" type="text/_javascript_"></script>
+<script src="" type="text/_javascript_"></script>
+<body>
+<style type="text/css" media="screen">
+
+ video, #shadow {
+ position: absolute;
+ left: 0;
+ top: 0;
+ width: 320px;
+ height: 240px;
+ }
+
+</style>
+<video src="" style="visibility: hidden;" controls autoplay></video>
+<div id="shadow"></div>
+<script type="text/_javascript_">
+
+window.jsTestIsAsync = true;
+
+description("Testing the <code>MuteSupport</code> behavior by clicking on the mute button.");
+
+const host = document.querySelector("div#shadow");
+const media = document.querySelector("video");
+const mediaController = createControls(host, media, null);
+
+shouldBeFalse("mediaController.controls.muteButton.muted");
+
+let numberOfEvents = 0;
+media.addEventListener("volumechange", function() {
+ debug("");
+ debug("volumechange event was dispatched");
+
+ numberOfEvents++;
+
+ if (numberOfEvents == 1) {
+ shouldBeTrue("media.muted");
+ shouldBeTrue("mediaController.controls.muteButton.muted");
+ pressOnMuteButton();
+ } else if (numberOfEvents == 2) {
+ shouldBeFalse("media.muted");
+ shouldBeFalse("mediaController.controls.muteButton.muted");
+ debug("");
+ host.remove();
+ media.remove();
+ finishJSTest();
+ }
+});
+
+function pressOnMuteButton()
+{
+ debug("");
+ debug("Pressing the mute button");
+ pressOnElement(mediaController.controls.muteButton.element);
+}
+
+media.addEventListener("play", event => {
+ media.pause();
+ pressOnMuteButton();
+});
+
+</script>
+<script src=""
+</body>
Modified: trunk/LayoutTests/platform/ios-simulator/TestExpectations (218239 => 218240)
--- trunk/LayoutTests/platform/ios-simulator/TestExpectations 2017-06-14 01:30:11 UTC (rev 218239)
+++ trunk/LayoutTests/platform/ios-simulator/TestExpectations 2017-06-14 02:39:02 UTC (rev 218240)
@@ -81,6 +81,7 @@
media/modern-media-controls/layout-item [ Pass ]
media/modern-media-controls/layout-node [ Pass ]
media/modern-media-controls/mute-button [ Pass ]
+media/modern-media-controls/mute-support [ Pass ]
media/modern-media-controls/pip-button [ Pass ]
media/modern-media-controls/pip-placard [ Pass ]
media/modern-media-controls/placard [ Pass ]
@@ -104,6 +105,7 @@
media/modern-media-controls/button/button.html [ Skip ]
media/modern-media-controls/button/button-active-state.html [ Skip ]
media/modern-media-controls/fullscreen-support/fullscreen-support-press.html [ Skip ]
+media/modern-media-controls/mute-support/mute-support-press-on-button.html [ Skip ]
# These tests rely on fullscreen which do not use the WebKit media controls on iOS
media/modern-media-controls/controls-visibility-support/controls-visibility-support-fullscreen-on-parent-element.html [ Skip ]
Modified: trunk/LayoutTests/platform/mac/TestExpectations (218239 => 218240)
--- trunk/LayoutTests/platform/mac/TestExpectations 2017-06-14 01:30:11 UTC (rev 218239)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2017-06-14 02:39:02 UTC (rev 218240)
@@ -1563,6 +1563,7 @@
media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-drag-is-prevented-over-button.html [ Pass ]
media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-drag.html [ Pass ]
media/modern-media-controls/mute-button [ Pass ]
+media/modern-media-controls/mute-support [ Pass ]
media/modern-media-controls/pip-button [ Pass ]
media/modern-media-controls/pip-placard [ Pass ]
media/modern-media-controls/placard [ Pass ]
