Diff
Modified: trunk/LayoutTests/ChangeLog (217891 => 217892)
--- trunk/LayoutTests/ChangeLog 2017-06-07 17:37:58 UTC (rev 217891)
+++ trunk/LayoutTests/ChangeLog 2017-06-07 17:40:43 UTC (rev 217892)
@@ -1,5 +1,33 @@
2017-06-07 Antoine Quint <grao...@apple.com>
+ Rebaseline and enable media/modern-media-controls/controls-visibility-support
+ https://bugs.webkit.org/show_bug.cgi?id=173060
+ <rdar://problem/32616840>
+
+ Reviewed by Eric Carlson.
+
+ We only check the "visible" property on the MediaControls instance which is the only thing being
+ set by this class now. We also fix entering fullscreen by not using a <button> element which has
+ some default styles set by the Button class. Finally, we make some videoTracks.length assertions
+ asynchronous to avoid timing issues.
+
+ * media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-off-audio-expected.txt:
+ * media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-off-audio.html:
+ * media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-off-expected.txt:
+ * media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-off.html:
+ * media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-on-audio-expected.txt:
+ * media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-on-audio.html:
+ * media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-on-expected.txt:
+ * media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-on.html:
+ * media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-toggle-expected.txt:
+ * media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-toggle.html:
+ * media/modern-media-controls/controls-visibility-support/controls-visibility-support-fullscreen-on-parent-element-expected.txt:
+ * media/modern-media-controls/controls-visibility-support/controls-visibility-support-fullscreen-on-parent-element.html:
+ * media/modern-media-controls/controls-visibility-support/controls-visibility-support-fullscreen-on-video-expected.txt:
+ * media/modern-media-controls/controls-visibility-support/controls-visibility-support-fullscreen-on-video.html:
+
+2017-06-07 Antoine Quint <grao...@apple.com>
+
Rebaseline and enable media/modern-media-controls/buttons-container
https://bugs.webkit.org/show_bug.cgi?id=173059
<rdar://problem/32616156>
Modified: trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-off-audio-expected.txt (217891 => 217892)
--- trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-off-audio-expected.txt 2017-06-07 17:37:58 UTC (rev 217891)
+++ trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-off-audio-expected.txt 2017-06-07 17:40:43 UTC (rev 217892)
@@ -4,12 +4,10 @@
Media has not begun loading yet
-PASS mediaController.controls.controlsBar.visible is false
-PASS mediaController.controls.startButton.visible is false
+PASS mediaController.controls.visible is false
Media has loaded metadata
-PASS mediaController.controls.controlsBar.visible is false
-PASS mediaController.controls.startButton.visible is false
+PASS mediaController.controls.visible is false
PASS successfullyParsed is true
Modified: trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-off-audio.html (217891 => 217892)
--- trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-off-audio.html 2017-06-07 17:37:58 UTC (rev 217891)
+++ trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-off-audio.html 2017-06-07 17:40:43 UTC (rev 217892)
@@ -14,14 +14,12 @@
const mediaController = createControls(shadowRoot, media, null);
debug("Media has not begun loading yet");
-shouldBeFalse("mediaController.controls.controlsBar.visible");
-shouldBeFalse("mediaController.controls.startButton.visible");
+shouldBeFalse("mediaController.controls.visible");
media.addEventListener("loadedmetadata", function() {
debug("");
debug("Media has loaded metadata");
- shouldBeFalse("mediaController.controls.controlsBar.visible");
- shouldBeFalse("mediaController.controls.startButton.visible");
+ shouldBeFalse("mediaController.controls.visible");
debug("");
shadowRoot.host.remove();
media.remove();
Modified: trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-off-expected.txt (217891 => 217892)
--- trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-off-expected.txt 2017-06-07 17:37:58 UTC (rev 217891)
+++ trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-off-expected.txt 2017-06-07 17:40:43 UTC (rev 217892)
@@ -4,12 +4,10 @@
Media has not begun loading yet
-PASS mediaController.controls.controlsBar.visible is false
-PASS mediaController.controls.startButton.visible is false
+PASS mediaController.controls.visible is false
Media has loaded metadata
-PASS mediaController.controls.controlsBar.visible is false
-PASS mediaController.controls.startButton.visible is false
+PASS mediaController.controls.visible is false
PASS successfullyParsed is true
Modified: trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-off.html (217891 => 217892)
--- trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-off.html 2017-06-07 17:37:58 UTC (rev 217891)
+++ trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-off.html 2017-06-07 17:40:43 UTC (rev 217892)
@@ -14,14 +14,12 @@
const mediaController = createControls(shadowRoot, media, null);
debug("Media has not begun loading yet");
-shouldBeFalse("mediaController.controls.controlsBar.visible");
-shouldBeFalse("mediaController.controls.startButton.visible");
+shouldBeFalse("mediaController.controls.visible");
media.addEventListener("loadedmetadata", function() {
debug("");
debug("Media has loaded metadata");
- shouldBeFalse("mediaController.controls.controlsBar.visible");
- shouldBeFalse("mediaController.controls.startButton.visible");
+ shouldBeFalse("mediaController.controls.visible");
debug("");
shadowRoot.host.remove();
media.remove();
Modified: trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-on-audio-expected.txt (217891 => 217892)
--- trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-on-audio-expected.txt 2017-06-07 17:37:58 UTC (rev 217891)
+++ trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-on-audio-expected.txt 2017-06-07 17:40:43 UTC (rev 217892)
@@ -4,12 +4,10 @@
Media has not begun loading yet
-PASS mediaController.controls.controlsBar.visible is true
-PASS mediaController.controls.startButton.visible is true
+PASS mediaController.controls.visible is true
Media has loaded metadata
-PASS mediaController.controls.controlsBar.visible is true
-PASS mediaController.controls.startButton.visible is true
+PASS mediaController.controls.visible is true
PASS successfullyParsed is true
Modified: trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-on-audio.html (217891 => 217892)
--- trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-on-audio.html 2017-06-07 17:37:58 UTC (rev 217891)
+++ trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-on-audio.html 2017-06-07 17:40:43 UTC (rev 217892)
@@ -14,14 +14,12 @@
const mediaController = createControls(shadowRoot, media, null);
debug("Media has not begun loading yet");
-shouldBeTrue("mediaController.controls.controlsBar.visible");
-shouldBeTrue("mediaController.controls.startButton.visible");
+shouldBeTrue("mediaController.controls.visible");
media.addEventListener("loadedmetadata", function() {
debug("");
debug("Media has loaded metadata");
- shouldBeTrue("mediaController.controls.controlsBar.visible");
- shouldBeTrue("mediaController.controls.startButton.visible");
+ shouldBeTrue("mediaController.controls.visible");
debug("");
shadowRoot.host.remove();
media.remove();
Modified: trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-on-expected.txt (217891 => 217892)
--- trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-on-expected.txt 2017-06-07 17:37:58 UTC (rev 217891)
+++ trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-on-expected.txt 2017-06-07 17:40:43 UTC (rev 217892)
@@ -5,9 +5,8 @@
Media has loaded metadata
-PASS media.videoTracks.length is 1
-PASS mediaController.controls.controlsBar.visible is true
-PASS mediaController.controls.startButton.visible is true
+PASS media.videoTracks.length became 1
+PASS mediaController.controls.visible is true
PASS successfullyParsed is true
Modified: trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-on.html (217891 => 217892)
--- trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-on.html 2017-06-07 17:37:58 UTC (rev 217891)
+++ trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-on.html 2017-06-07 17:40:43 UTC (rev 217892)
@@ -16,13 +16,13 @@
media.addEventListener("loadedmetadata", function() {
debug("");
debug("Media has loaded metadata");
- shouldBe("media.videoTracks.length", "1");
- shouldBeTrue("mediaController.controls.controlsBar.visible");
- shouldBeTrue("mediaController.controls.startButton.visible");
- debug("");
- shadowRoot.host.remove();
- media.remove();
- finishJSTest();
+ shouldBecomeEqual("media.videoTracks.length", "1", () => {
+ shouldBeTrue("mediaController.controls.visible");
+ debug("");
+ shadowRoot.host.remove();
+ media.remove();
+ finishJSTest();
+ });
});
</script>
Modified: trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-toggle-expected.txt (217891 => 217892)
--- trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-toggle-expected.txt 2017-06-07 17:37:58 UTC (rev 217891)
+++ trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-toggle-expected.txt 2017-06-07 17:40:43 UTC (rev 217892)
@@ -5,17 +5,14 @@
Media has loaded metadata
-PASS media.videoTracks.length is 1
-PASS mediaController.controls.controlsBar.visible is true
-PASS mediaController.controls.startButton.visible is true
+PASS media.videoTracks.length became 1
+PASS mediaController.controls.visible is true
Turning controls off
-PASS mediaController.controls.controlsBar.visible is false
-PASS mediaController.controls.startButton.visible is false
+PASS mediaController.controls.visible is false
Turning controls back on
-PASS mediaController.controls.controlsBar.visible is true
-PASS mediaController.controls.startButton.visible is true
+PASS mediaController.controls.visible is true
PASS successfullyParsed is true
Modified: trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-toggle.html (217891 => 217892)
--- trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-toggle.html 2017-06-07 17:37:58 UTC (rev 217891)
+++ trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-toggle.html 2017-06-07 17:40:43 UTC (rev 217892)
@@ -18,15 +18,13 @@
numberOfMutations++;
if (numberOfMutations === 1) {
- shouldBeFalse("mediaController.controls.controlsBar.visible");
- shouldBeFalse("mediaController.controls.startButton.visible");
+ shouldBeFalse("mediaController.controls.visible");
debug("");
debug("Turning controls back on");
media.controls = true;
} else {
- shouldBeTrue("mediaController.controls.controlsBar.visible");
- shouldBeTrue("mediaController.controls.startButton.visible");
+ shouldBeTrue("mediaController.controls.visible");
debug("");
shadowRoot.host.remove();
@@ -38,13 +36,13 @@
media.addEventListener("loadedmetadata", function() {
debug("");
debug("Media has loaded metadata");
- shouldBe("media.videoTracks.length", "1");
- shouldBeTrue("mediaController.controls.controlsBar.visible");
- shouldBeTrue("mediaController.controls.startButton.visible");
+ shouldBecomeEqual("media.videoTracks.length", "1", () => {
+ shouldBeTrue("mediaController.controls.visible");
- debug("");
- debug("Turning controls off");
- media.controls = false;
+ debug("");
+ debug("Turning controls off");
+ media.controls = false;
+ });
});
</script>
Modified: trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-fullscreen-on-parent-element-expected.txt (217891 => 217892)
--- trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-fullscreen-on-parent-element-expected.txt 2017-06-07 17:37:58 UTC (rev 217891)
+++ trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-fullscreen-on-parent-element-expected.txt 2017-06-07 17:40:43 UTC (rev 217892)
@@ -5,7 +5,7 @@
PASS document.webkitFullscreenElement is document.documentElement
PASS media.webkitDisplayingFullscreen is false
-PASS mediaController.controls.controlsBar.visible is false
+PASS mediaController.controls.visible is false
PASS successfullyParsed is true
TEST COMPLETE
Modified: trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-fullscreen-on-parent-element.html (217891 => 217892)
--- trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-fullscreen-on-parent-element.html 2017-06-07 17:37:58 UTC (rev 217891)
+++ trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-fullscreen-on-parent-element.html 2017-06-07 17:40:43 UTC (rev 217892)
@@ -18,7 +18,7 @@
document.documentElement.addEventListener("webkitfullscreenchange", () => {
shouldBe("document.webkitFullscreenElement", "document.documentElement");
shouldBeFalse("media.webkitDisplayingFullscreen");
- shouldBeFalse("mediaController.controls.controlsBar.visible");
+ shouldBeFalse("mediaController.controls.visible");
button.remove();
container.remove();
media.remove();
@@ -25,7 +25,9 @@
finishJSTest();
});
- const button = document.body.appendChild(document.createElement("button"));
+ const button = document.body.appendChild(document.createElement("div"));
+ button.setAttribute("style", "position: absolute; left: 0; top: 0;");
+ button.innerText = "Enter fullscreen";
button.addEventListener("click", () => document.documentElement.webkitRequestFullscreen());
pressOnElement(button);
});
Modified: trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-fullscreen-on-video-expected.txt (217891 => 217892)
--- trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-fullscreen-on-video-expected.txt 2017-06-07 17:37:58 UTC (rev 217891)
+++ trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-fullscreen-on-video-expected.txt 2017-06-07 17:40:43 UTC (rev 217892)
@@ -4,7 +4,7 @@
PASS media.webkitDisplayingFullscreen is true
-PASS mediaController.controls.controlsBar.visible is true
+PASS mediaController.controls.visible is true
PASS successfullyParsed is true
TEST COMPLETE
Modified: trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-fullscreen-on-video.html (217891 => 217892)
--- trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-fullscreen-on-video.html 2017-06-07 17:37:58 UTC (rev 217891)
+++ trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-fullscreen-on-video.html 2017-06-07 17:40:43 UTC (rev 217892)
@@ -17,7 +17,7 @@
media.addEventListener("play", () => {
media.addEventListener("webkitfullscreenchange", () => {
shouldBeTrue("media.webkitDisplayingFullscreen");
- shouldBeTrue("mediaController.controls.controlsBar.visible");
+ shouldBeTrue("mediaController.controls.visible");
button.remove();
container.remove();
media.remove();
@@ -24,7 +24,9 @@
finishJSTest();
});
- const button = document.body.appendChild(document.createElement("button"));
+ const button = document.body.appendChild(document.createElement("div"));
+ button.setAttribute("style", "position: absolute; left: 0; top: 0;");
+ button.innerText = "Enter fullscreen";
button.addEventListener("click", () => media.webkitEnterFullscreen());
pressOnElement(button);
});
Modified: trunk/LayoutTests/platform/ios-simulator/TestExpectations (217891 => 217892)
--- trunk/LayoutTests/platform/ios-simulator/TestExpectations 2017-06-07 17:37:58 UTC (rev 217891)
+++ trunk/LayoutTests/platform/ios-simulator/TestExpectations 2017-06-07 17:40:43 UTC (rev 217892)
@@ -61,6 +61,7 @@
media/modern-media-controls/background-tint [ Pass ]
media/modern-media-controls/button [ Pass ]
media/modern-media-controls/buttons-container [ Pass ]
+media/modern-media-controls/controls-visibility-support [ Pass ]
# AirPlay cannot be tested on iOS
webkit.org/b/166062 media/modern-media-controls/airplay-support [ Skip ]
@@ -70,6 +71,10 @@
media/modern-media-controls/button/button.html [ Skip ]
media/modern-media-controls/button/button-active-state.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 ]
+media/modern-media-controls/controls-visibility-support/controls-visibility-support-fullscreen-on-video.html [ Skip ]
+
webkit.org/b/172965 media/track/track-cue-overlap-snap-to-lines-not-set.html [ Failure ]
webkit.org/b/156718 storage/websql/alter-to-info-table.html [ Failure ]
Modified: trunk/LayoutTests/platform/mac/TestExpectations (217891 => 217892)
--- trunk/LayoutTests/platform/mac/TestExpectations 2017-06-07 17:37:58 UTC (rev 217891)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2017-06-07 17:40:43 UTC (rev 217892)
@@ -1556,6 +1556,7 @@
media/modern-media-controls/background-tint [ Pass ]
media/modern-media-controls/button [ Pass ]
media/modern-media-controls/buttons-container [ Pass ]
+media/modern-media-controls/controls-visibility-support [ Pass ]
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/volume-up-support [ Pass ]
