Diff
Modified: trunk/LayoutTests/ChangeLog (209107 => 209108)
--- trunk/LayoutTests/ChangeLog 2016-11-30 01:58:48 UTC (rev 209107)
+++ trunk/LayoutTests/ChangeLog 2016-11-30 02:26:04 UTC (rev 209108)
@@ -1,3 +1,36 @@
+2016-11-29 Antoine Quint <[email protected]>
+
+ [Modern Media Controls] Only show controls when the controls attribute is set
+ https://bugs.webkit.org/show_bug.cgi?id=165175
+
+ We add new tests to check that the media's "control" attribute is respected. We also update a
+ series of tests to be more robust and turn the media "controls" attribute on so that the controls
+ bar is displayed as required by the tests.
+
+ Reviewed by Dean Jackson.
+
+ * media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-off-audio-expected.txt: Added.
+ * media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-off-audio.html: Added.
+ * media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-off-expected.txt: Added.
+ * media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-off.html: Added.
+ * media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-on-audio-expected.txt: Added.
+ * media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-on-audio.html: Added.
+ * media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-on-expected.txt: Added.
+ * media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-on.html: Added.
+ * media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-toggle-expected.txt: Added.
+ * media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-toggle.html: Added.
+ * media/modern-media-controls/fullscreen-support/fullscreen-support-click.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/pip-support/pip-support-click.html:
+ * media/modern-media-controls/placard-support/placard-support-airplay.html:
+ * media/modern-media-controls/scrubber-support/scrubber-support-click-expected.txt:
+ * media/modern-media-controls/scrubber-support/scrubber-support-click.html:
+ * media/modern-media-controls/scrubber-support/scrubber-support-drag-expected.txt:
+ * media/modern-media-controls/scrubber-support/scrubber-support-drag.html:
+ * media/modern-media-controls/volume-support/volume-support-click.html:
+ * media/modern-media-controls/volume-support/volume-support-drag.html:
+
2016-11-29 Ryan Haddad <[email protected]>
Marking media/modern-media-controls/tracks-support/tracks-support-audio-tracks.html as flaky on ios-simulator.
Added: trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-off-audio-expected.txt (0 => 209108)
--- trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-off-audio-expected.txt (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-off-audio-expected.txt 2016-11-30 02:26:04 UTC (rev 209108)
@@ -0,0 +1,17 @@
+Testing the ControlsVisibilitySupport behavior for audio without controls.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Media has not begun loading yet
+PASS mediaController.controls.controlsBar.visible is false
+PASS mediaController.controls.startButton.visible is false
+
+Media has loaded metadata
+PASS mediaController.controls.controlsBar.visible is false
+PASS mediaController.controls.startButton.visible is false
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
Added: trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-off-audio.html (0 => 209108)
--- trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-off-audio.html (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-off-audio.html 2016-11-30 02:26:04 UTC (rev 209108)
@@ -0,0 +1,33 @@
+<script src=""
+<script src="" type="text/_javascript_"></script>
+<body>
+<audio src="" style="width: 320px; height: 240px;"></audio>
+<div id="shadow"></div>
+<script type="text/_javascript_">
+
+window.jsTestIsAsync = true;
+
+description("Testing the <code>ControlsVisibilitySupport</code> behavior for audio without controls.");
+
+const shadowRoot = document.querySelector("div#shadow").attachShadow({ mode: "open" });
+const media = document.querySelector("audio");
+const mediaController = createControls(shadowRoot, media, null);
+
+debug("Media has not begun loading yet");
+shouldBeFalse("mediaController.controls.controlsBar.visible");
+shouldBeFalse("mediaController.controls.startButton.visible");
+
+media.addEventListener("loadedmetadata", function() {
+ debug("");
+ debug("Media has loaded metadata");
+ shouldBeFalse("mediaController.controls.controlsBar.visible");
+ shouldBeFalse("mediaController.controls.startButton.visible");
+ debug("");
+ shadowRoot.host.remove();
+ media.remove();
+ finishJSTest();
+});
+
+</script>
+<script src=""
+</body>
Added: trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-off-expected.txt (0 => 209108)
--- trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-off-expected.txt (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-off-expected.txt 2016-11-30 02:26:04 UTC (rev 209108)
@@ -0,0 +1,17 @@
+Testing the ControlsVisibilitySupport behavior without controls.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Media has not begun loading yet
+PASS mediaController.controls.controlsBar.visible is false
+PASS mediaController.controls.startButton.visible is false
+
+Media has loaded metadata
+PASS mediaController.controls.controlsBar.visible is false
+PASS mediaController.controls.startButton.visible is false
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
Added: trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-off.html (0 => 209108)
--- trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-off.html (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-off.html 2016-11-30 02:26:04 UTC (rev 209108)
@@ -0,0 +1,33 @@
+<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>ControlsVisibilitySupport</code> behavior without controls.");
+
+const shadowRoot = document.querySelector("div#shadow").attachShadow({ mode: "open" });
+const media = document.querySelector("video");
+const mediaController = createControls(shadowRoot, media, null);
+
+debug("Media has not begun loading yet");
+shouldBeFalse("mediaController.controls.controlsBar.visible");
+shouldBeFalse("mediaController.controls.startButton.visible");
+
+media.addEventListener("loadedmetadata", function() {
+ debug("");
+ debug("Media has loaded metadata");
+ shouldBeFalse("mediaController.controls.controlsBar.visible");
+ shouldBeFalse("mediaController.controls.startButton.visible");
+ debug("");
+ shadowRoot.host.remove();
+ media.remove();
+ finishJSTest();
+});
+
+</script>
+<script src=""
+</body>
Added: trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-on-audio-expected.txt (0 => 209108)
--- trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-on-audio-expected.txt (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-on-audio-expected.txt 2016-11-30 02:26:04 UTC (rev 209108)
@@ -0,0 +1,17 @@
+Testing the ControlsVisibilitySupport behavior for audio without controls.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Media has not begun loading yet
+PASS mediaController.controls.controlsBar.visible is true
+PASS mediaController.controls.startButton.visible is true
+
+Media has loaded metadata
+PASS mediaController.controls.controlsBar.visible is true
+PASS mediaController.controls.startButton.visible is true
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
Added: trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-on-audio.html (0 => 209108)
--- trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-on-audio.html (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-on-audio.html 2016-11-30 02:26:04 UTC (rev 209108)
@@ -0,0 +1,33 @@
+<script src=""
+<script src="" type="text/_javascript_"></script>
+<body>
+<audio src="" style="width: 320px; height: 240px;" controls></audio>
+<div id="shadow"></div>
+<script type="text/_javascript_">
+
+window.jsTestIsAsync = true;
+
+description("Testing the <code>ControlsVisibilitySupport</code> behavior for audio without controls.");
+
+const shadowRoot = document.querySelector("div#shadow").attachShadow({ mode: "open" });
+const media = document.querySelector("audio");
+const mediaController = createControls(shadowRoot, media, null);
+
+debug("Media has not begun loading yet");
+shouldBeTrue("mediaController.controls.controlsBar.visible");
+shouldBeTrue("mediaController.controls.startButton.visible");
+
+media.addEventListener("loadedmetadata", function() {
+ debug("");
+ debug("Media has loaded metadata");
+ shouldBeTrue("mediaController.controls.controlsBar.visible");
+ shouldBeTrue("mediaController.controls.startButton.visible");
+ debug("");
+ shadowRoot.host.remove();
+ media.remove();
+ finishJSTest();
+});
+
+</script>
+<script src=""
+</body>
Added: trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-on-expected.txt (0 => 209108)
--- trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-on-expected.txt (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-on-expected.txt 2016-11-30 02:26:04 UTC (rev 209108)
@@ -0,0 +1,17 @@
+Testing the ControlsVisibilitySupport behavior without controls.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Media has not begun loading yet
+PASS mediaController.controls.controlsBar.visible is false
+PASS mediaController.controls.startButton.visible is false
+
+Media has loaded metadata
+PASS mediaController.controls.controlsBar.visible is true
+PASS mediaController.controls.startButton.visible is true
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
Added: trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-on.html (0 => 209108)
--- trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-on.html (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-on.html 2016-11-30 02:26:04 UTC (rev 209108)
@@ -0,0 +1,33 @@
+<script src=""
+<script src="" type="text/_javascript_"></script>
+<body>
+<video src="" style="width: 320px; height: 240px;" controls></video>
+<div id="shadow"></div>
+<script type="text/_javascript_">
+
+window.jsTestIsAsync = true;
+
+description("Testing the <code>ControlsVisibilitySupport</code> behavior without controls.");
+
+const shadowRoot = document.querySelector("div#shadow").attachShadow({ mode: "open" });
+const media = document.querySelector("video");
+const mediaController = createControls(shadowRoot, media, null);
+
+debug("Media has not begun loading yet");
+shouldBeFalse("mediaController.controls.controlsBar.visible");
+shouldBeFalse("mediaController.controls.startButton.visible");
+
+media.addEventListener("loadedmetadata", function() {
+ debug("");
+ debug("Media has loaded metadata");
+ shouldBeTrue("mediaController.controls.controlsBar.visible");
+ shouldBeTrue("mediaController.controls.startButton.visible");
+ debug("");
+ shadowRoot.host.remove();
+ media.remove();
+ finishJSTest();
+});
+
+</script>
+<script src=""
+</body>
Added: trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-toggle-expected.txt (0 => 209108)
--- trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-toggle-expected.txt (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-toggle-expected.txt 2016-11-30 02:26:04 UTC (rev 209108)
@@ -0,0 +1,25 @@
+Testing the ControlsVisibilitySupport behavior when the controls attribute changes.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Media has not begun loading yet
+PASS mediaController.controls.controlsBar.visible is false
+PASS mediaController.controls.startButton.visible is false
+
+Media has loaded metadata
+PASS mediaController.controls.controlsBar.visible is true
+PASS mediaController.controls.startButton.visible is true
+
+Turning controls off
+PASS mediaController.controls.controlsBar.visible is false
+PASS mediaController.controls.startButton.visible is false
+
+Turning controls back on
+PASS mediaController.controls.controlsBar.visible is true
+PASS mediaController.controls.startButton.visible is true
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
Added: trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-toggle.html (0 => 209108)
--- trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-toggle.html (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-toggle.html 2016-11-30 02:26:04 UTC (rev 209108)
@@ -0,0 +1,55 @@
+<script src=""
+<script src="" type="text/_javascript_"></script>
+<body>
+<video src="" style="width: 320px; height: 240px;" controls></video>
+<div id="shadow"></div>
+<script type="text/_javascript_">
+
+window.jsTestIsAsync = true;
+
+description("Testing the <code>ControlsVisibilitySupport</code> behavior when the controls attribute changes.");
+
+const shadowRoot = document.querySelector("div#shadow").attachShadow({ mode: "open" });
+const media = document.querySelector("video");
+const mediaController = createControls(shadowRoot, media, null);
+
+let numberOfMutations = 0;
+new MutationObserver(() => {
+ numberOfMutations++;
+
+ if (numberOfMutations === 1) {
+ shouldBeFalse("mediaController.controls.controlsBar.visible");
+ shouldBeFalse("mediaController.controls.startButton.visible");
+
+ debug("");
+ debug("Turning controls back on");
+ media.controls = true;
+ } else {
+ shouldBeTrue("mediaController.controls.controlsBar.visible");
+ shouldBeTrue("mediaController.controls.startButton.visible");
+
+ debug("");
+ shadowRoot.host.remove();
+ media.remove();
+ finishJSTest();
+ }
+}).observe(media, { attributes: true, attributeFilter: ["controls"] });
+
+debug("Media has not begun loading yet");
+shouldBeFalse("mediaController.controls.controlsBar.visible");
+shouldBeFalse("mediaController.controls.startButton.visible");
+
+media.addEventListener("loadedmetadata", function() {
+ debug("");
+ debug("Media has loaded metadata");
+ shouldBeTrue("mediaController.controls.controlsBar.visible");
+ shouldBeTrue("mediaController.controls.startButton.visible");
+
+ debug("");
+ debug("Turning controls off");
+ media.controls = false;
+});
+
+</script>
+<script src=""
+</body>
Modified: trunk/LayoutTests/media/modern-media-controls/fullscreen-support/fullscreen-support-click.html (209107 => 209108)
--- trunk/LayoutTests/media/modern-media-controls/fullscreen-support/fullscreen-support-click.html 2016-11-30 01:58:48 UTC (rev 209107)
+++ trunk/LayoutTests/media/modern-media-controls/fullscreen-support/fullscreen-support-click.html 2016-11-30 02:26:04 UTC (rev 209108)
@@ -15,7 +15,7 @@
}
</style>
-<video src="" autoplay></video>
+<video src="" controls autoplay></video>
<div id="host"></div>
<script type="text/_javascript_">
Modified: trunk/LayoutTests/media/modern-media-controls/media-controls/media-controls-constructor-expected.txt (209107 => 209108)
--- trunk/LayoutTests/media/modern-media-controls/media-controls/media-controls-constructor-expected.txt 2016-11-30 01:58:48 UTC (rev 209107)
+++ trunk/LayoutTests/media/modern-media-controls/media-controls/media-controls-constructor-expected.txt 2016-11-30 02:26:04 UTC (rev 209108)
@@ -22,7 +22,7 @@
PASS mediaControls.airplayPlacard instanceof AirplayPlacard is true
PASS mediaControls.pipPlacard instanceof PiPPlacard is true
-PASS mediaControls.controlsBar instanceof LayoutItem is true
+PASS mediaControls.controlsBar instanceof ControlsBar is true
PASS mediaControls.controlsBar.element.localName is "div"
PASS mediaControls.controlsBar.element.className is "controls-bar"
Modified: trunk/LayoutTests/media/modern-media-controls/media-controls/media-controls-constructor.html (209107 => 209108)
--- trunk/LayoutTests/media/modern-media-controls/media-controls/media-controls-constructor.html 2016-11-30 01:58:48 UTC (rev 209107)
+++ trunk/LayoutTests/media/modern-media-controls/media-controls/media-controls-constructor.html 2016-11-30 02:26:04 UTC (rev 209108)
@@ -29,7 +29,7 @@
shouldBeTrue("mediaControls.pipPlacard instanceof PiPPlacard");
debug("");
-shouldBeTrue("mediaControls.controlsBar instanceof LayoutItem");
+shouldBeTrue("mediaControls.controlsBar instanceof ControlsBar");
shouldBeEqualToString("mediaControls.controlsBar.element.localName", "div");
shouldBeEqualToString("mediaControls.controlsBar.element.className", "controls-bar");
Modified: trunk/LayoutTests/media/modern-media-controls/pip-support/pip-support-click.html (209107 => 209108)
--- trunk/LayoutTests/media/modern-media-controls/pip-support/pip-support-click.html 2016-11-30 01:58:48 UTC (rev 209107)
+++ trunk/LayoutTests/media/modern-media-controls/pip-support/pip-support-click.html 2016-11-30 02:26:04 UTC (rev 209108)
@@ -15,7 +15,7 @@
}
</style>
-<video src="" autoplay></video>
+<video src="" autoplay controls></video>
<div id="host"></div>
<script type="text/_javascript_">
Modified: trunk/LayoutTests/media/modern-media-controls/placard-support/placard-support-airplay.html (209107 => 209108)
--- trunk/LayoutTests/media/modern-media-controls/placard-support/placard-support-airplay.html 2016-11-30 01:58:48 UTC (rev 209107)
+++ trunk/LayoutTests/media/modern-media-controls/placard-support/placard-support-airplay.html 2016-11-30 02:26:04 UTC (rev 209108)
@@ -15,7 +15,7 @@
}
</style>
-<video src="" autoplay></video>
+<video src="" controls autoplay></video>
<div id="host"></div>
<script type="text/_javascript_">
Modified: trunk/LayoutTests/media/modern-media-controls/scrubber-support/scrubber-support-click-expected.txt (209107 => 209108)
--- trunk/LayoutTests/media/modern-media-controls/scrubber-support/scrubber-support-click-expected.txt 2016-11-30 01:58:48 UTC (rev 209107)
+++ trunk/LayoutTests/media/modern-media-controls/scrubber-support/scrubber-support-click-expected.txt 2016-11-30 02:26:04 UTC (rev 209108)
@@ -3,7 +3,7 @@
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-PASS media.currentTime is 3.1872
+PASS media.currentTime is within 0.2 of 3.1872
PASS successfullyParsed is true
TEST COMPLETE
Modified: trunk/LayoutTests/media/modern-media-controls/scrubber-support/scrubber-support-click.html (209107 => 209108)
--- trunk/LayoutTests/media/modern-media-controls/scrubber-support/scrubber-support-click.html 2016-11-30 01:58:48 UTC (rev 209107)
+++ trunk/LayoutTests/media/modern-media-controls/scrubber-support/scrubber-support-click.html 2016-11-30 02:26:04 UTC (rev 209108)
@@ -15,7 +15,7 @@
}
</style>
-<video src=""
+<video src="" controls autoplay></video>
<div id="host"></div>
<script type="text/_javascript_">
@@ -29,10 +29,14 @@
mediaController.controls.showsStartButton = false;
-media.addEventListener("canplaythrough", () => {
+scheduler.frameDidFire = function() {
+ if (media.paused)
+ return;
+ media.pause();
+
media.addEventListener("timeupdate", () => {
- shouldBe("media.currentTime", "3.1872");
+ shouldBeCloseTo("media.currentTime", 3.1872, 0.2);
container.remove();
media.remove();
finishJSTest();
@@ -46,7 +50,7 @@
eventSender.mouseMoveTo(centerX, centerY);
eventSender.mouseDown();
eventSender.mouseUp();
-});
+};
</script>
<script src=""
Modified: trunk/LayoutTests/media/modern-media-controls/scrubber-support/scrubber-support-drag-expected.txt (209107 => 209108)
--- trunk/LayoutTests/media/modern-media-controls/scrubber-support/scrubber-support-drag-expected.txt 2016-11-30 01:58:48 UTC (rev 209107)
+++ trunk/LayoutTests/media/modern-media-controls/scrubber-support/scrubber-support-drag-expected.txt 2016-11-30 02:26:04 UTC (rev 209108)
@@ -3,7 +3,7 @@
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-PASS media.currentTime is media.duration / 2
+PASS media.currentTime is within 0.01 of 3.0136
PASS media.currentTime is 0
PASS successfullyParsed is true
Modified: trunk/LayoutTests/media/modern-media-controls/scrubber-support/scrubber-support-drag.html (209107 => 209108)
--- trunk/LayoutTests/media/modern-media-controls/scrubber-support/scrubber-support-drag.html 2016-11-30 01:58:48 UTC (rev 209107)
+++ trunk/LayoutTests/media/modern-media-controls/scrubber-support/scrubber-support-drag.html 2016-11-30 02:26:04 UTC (rev 209108)
@@ -15,7 +15,7 @@
}
</style>
-<video src="" autoplay></video>
+<video src="" autoplay controls></video>
<div id="host"></div>
<script type="text/_javascript_">
@@ -28,11 +28,18 @@
const mediaController = createControls(container, media, null);
let numberOfEvents = 0;
-media.addEventListener("play", () => {
+scheduler.frameDidFire = function() {
+ if (media.paused)
+ return;
+
media.pause();
const input = mediaController.controls.timeControl.scrubber.children[1].element;
const bounds = input.getBoundingClientRect();
+
+ if (bounds.width === 0)
+ return;
+
const minX = bounds.left;
const dragStartX = bounds.left + bounds.width / 2;
const dragEndX = bounds.left;
@@ -42,7 +49,7 @@
numberOfEvents++;
if (numberOfEvents == 1) {
- shouldBe("media.currentTime", "media.duration / 2");
+ shouldBeCloseTo("media.currentTime", media.duration / 2, 0.01);
const delta = dragEndX - dragStartX;
const iterations = Math.abs(delta);
for (let i = 1; i <= iterations; ++i)
@@ -61,7 +68,7 @@
// Start dragging.
eventSender.mouseMoveTo(dragStartX, centerY);
eventSender.mouseDown();
-});
+};
</script>
<script src=""
Modified: trunk/LayoutTests/media/modern-media-controls/volume-support/volume-support-click.html (209107 => 209108)
--- trunk/LayoutTests/media/modern-media-controls/volume-support/volume-support-click.html 2016-11-30 01:58:48 UTC (rev 209107)
+++ trunk/LayoutTests/media/modern-media-controls/volume-support/volume-support-click.html 2016-11-30 02:26:04 UTC (rev 209108)
@@ -15,7 +15,7 @@
}
</style>
-<video src=""
+<video src="" controls autoplay></video>
<div id="host"></div>
<script type="text/_javascript_">
@@ -29,6 +29,9 @@
let numberOfFrames = 0;
scheduler.frameDidFire = function() {
+ if (media.paused)
+ return;
+
numberOfFrames++;
if (numberOfFrames == 1) {
Modified: trunk/LayoutTests/media/modern-media-controls/volume-support/volume-support-drag.html (209107 => 209108)
--- trunk/LayoutTests/media/modern-media-controls/volume-support/volume-support-drag.html 2016-11-30 01:58:48 UTC (rev 209107)
+++ trunk/LayoutTests/media/modern-media-controls/volume-support/volume-support-drag.html 2016-11-30 02:26:04 UTC (rev 209108)
@@ -15,7 +15,7 @@
}
</style>
-<video src="" muted></video>
+<video src="" muted autoplay controls></video>
<div id="host"></div>
<script type="text/_javascript_">
@@ -32,6 +32,9 @@
let numberOfFrames = 0;
scheduler.frameDidFire = function() {
+ if (media.paused)
+ return;
+
numberOfFrames++;
if (numberOfFrames == 1) {
Modified: trunk/Source/WebCore/ChangeLog (209107 => 209108)
--- trunk/Source/WebCore/ChangeLog 2016-11-30 01:58:48 UTC (rev 209107)
+++ trunk/Source/WebCore/ChangeLog 2016-11-30 02:26:04 UTC (rev 209108)
@@ -1,3 +1,36 @@
+2016-11-29 Antoine Quint <[email protected]>
+
+ [Modern Media Controls] Only show controls when the controls attribute is set
+ https://bugs.webkit.org/show_bug.cgi?id=165175
+
+ We now respect the value of the media's "controls" attribute so that the start button and the controls
+ bar are only shown when that attribute is set to "true".
+
+ Reviewed by Dean Jackson.
+
+ Tests: 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.html
+ 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.html
+ media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-toggle.html
+
+ * Modules/modern-media-controls/controls/controls-bar.js: Added.
+ (ControlsBar):
+ * Modules/modern-media-controls/controls/media-controls.js:
+ (MediaControls.): Deleted.
+ * Modules/modern-media-controls/js-files:
+ * Modules/modern-media-controls/media/controls-visibility-support.js: Added.
+ (ControlsVisibilitySupport):
+ (ControlsVisibilitySupport.prototype.destroy):
+ (ControlsVisibilitySupport.prototype.get mediaEvents):
+ (ControlsVisibilitySupport.prototype.syncControl):
+ * Modules/modern-media-controls/media/media-controller-support.js:
+ (MediaControllerSupport):
+ (MediaControllerSupport.prototype.handleEvent):
+ * Modules/modern-media-controls/media/media-controller.js:
+ (MediaController.prototype._updateControlsIfNeeded):
+ * WebCore.xcodeproj/project.pbxproj:
+
2016-11-29 Brady Eidson <[email protected]>
Followup to:
Copied: trunk/Source/WebCore/Modules/modern-media-controls/controls/controls-bar.js (from rev 209104, trunk/Source/WebCore/Modules/modern-media-controls/media/media-controller-support.js) (0 => 209108)
--- trunk/Source/WebCore/Modules/modern-media-controls/controls/controls-bar.js (rev 0)
+++ trunk/Source/WebCore/Modules/modern-media-controls/controls/controls-bar.js 2016-11-30 02:26:04 UTC (rev 209108)
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2016 Apple Inc. All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+class ControlsBar extends LayoutNode
+{
+
+ constructor()
+ {
+ super(`<div class="controls-bar">`);
+ }
+
+}
Modified: trunk/Source/WebCore/Modules/modern-media-controls/controls/media-controls.js (209107 => 209108)
--- trunk/Source/WebCore/Modules/modern-media-controls/controls/media-controls.js 2016-11-30 01:58:48 UTC (rev 209107)
+++ trunk/Source/WebCore/Modules/modern-media-controls/controls/media-controls.js 2016-11-30 02:26:04 UTC (rev 209108)
@@ -45,10 +45,7 @@
this.statusLabel = new StatusLabel(this)
this.timeControl = new TimeControl(this);
- this.controlsBar = new LayoutItem({
- element: `<div class="controls-bar">`,
- layoutDelegate: this
- });
+ this.controlsBar = new ControlsBar;
this.airplayPlacard = new AirplayPlacard(this);
this.pipPlacard = new PiPPlacard(this);
Modified: trunk/Source/WebCore/Modules/modern-media-controls/js-files (209107 => 209108)
--- trunk/Source/WebCore/Modules/modern-media-controls/js-files 2016-11-30 01:58:48 UTC (rev 209107)
+++ trunk/Source/WebCore/Modules/modern-media-controls/js-files 2016-11-30 02:26:04 UTC (rev 209108)
@@ -22,6 +22,7 @@
controls/forward-button.js
controls/buttons-container.js
controls/status-label.js
+controls/controls-bar.js
controls/media-controls.js
controls/ios-inline-media-controls.js
controls/macos-media-controls.js
@@ -32,6 +33,7 @@
controls/pip-placard.js
media/media-controller-support.js
media/airplay-support.js
+media/controls-visibility-support.js
media/elapsed-time-support.js
media/fullscreen-support.js
media/mute-support.js
Copied: trunk/Source/WebCore/Modules/modern-media-controls/media/controls-visibility-support.js (from rev 209104, trunk/Source/WebCore/Modules/modern-media-controls/media/media-controller-support.js) (0 => 209108)
--- trunk/Source/WebCore/Modules/modern-media-controls/media/controls-visibility-support.js (rev 0)
+++ trunk/Source/WebCore/Modules/modern-media-controls/media/controls-visibility-support.js 2016-11-30 02:26:04 UTC (rev 209108)
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2016 Apple Inc. All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+class ControlsVisibilitySupport extends MediaControllerSupport
+{
+
+ constructor(mediaController)
+ {
+ super(mediaController);
+
+ this._controlsAttributeObserver = new MutationObserver(this.syncControl.bind(this));
+ this._controlsAttributeObserver.observe(mediaController.media, { attributes: true, attributeFilter: ["controls"] });
+ }
+
+ // Protected
+
+ destroy()
+ {
+ this._controlsAttributeObserver.disconnect();
+ }
+
+ get mediaEvents()
+ {
+ return ["loadedmetadata"];
+ }
+
+ syncControl()
+ {
+ let shouldShowControls = this.mediaController.media.controls;
+ if (media instanceof HTMLVideoElement)
+ shouldShowControls = shouldShowControls && this.mediaController.media.readyState > HTMLMediaElement.HAVE_NOTHING;
+
+ this.mediaController.controls.startButton.visible = shouldShowControls;
+ this.mediaController.controls.controlsBar.visible = shouldShowControls;
+ }
+
+}
Modified: trunk/Source/WebCore/Modules/modern-media-controls/media/media-controller-support.js (209107 => 209108)
--- trunk/Source/WebCore/Modules/modern-media-controls/media/media-controller-support.js 2016-11-30 01:58:48 UTC (rev 209107)
+++ trunk/Source/WebCore/Modules/modern-media-controls/media/media-controller-support.js 2016-11-30 02:26:04 UTC (rev 209108)
@@ -33,12 +33,12 @@
for (let eventType of this.mediaEvents)
mediaController.media.addEventListener(eventType, this);
+ this.syncControl();
+
if (!this.control)
return;
this.control.uiDelegate = this;
-
- this.syncControl();
}
// Public
@@ -74,8 +74,7 @@
handleEvent(event)
{
// Implemented by subclasses.
- if (this.control)
- this.syncControl();
+ this.syncControl();
}
syncControl()
Modified: trunk/Source/WebCore/Modules/modern-media-controls/media/media-controller.js (209107 => 209108)
--- trunk/Source/WebCore/Modules/modern-media-controls/media/media-controller.js 2016-11-30 01:58:48 UTC (rev 209107)
+++ trunk/Source/WebCore/Modules/modern-media-controls/media/media-controller.js 2016-11-30 02:26:04 UTC (rev 209108)
@@ -92,7 +92,7 @@
this._updateControlsSize();
- this._supportingObjects = [AirplaySupport, ElapsedTimeSupport, FullscreenSupport, MuteSupport, PiPSupport, PlacardSupport, PlaybackSupport, RemainingTimeSupport, ScrubbingSupport, SkipBackSupport, StartSupport, StatusSupport, TracksSupport, VolumeSupport].map(SupportClass => {
+ this._supportingObjects = [AirplaySupport, ControlsVisibilitySupport, ElapsedTimeSupport, FullscreenSupport, MuteSupport, PiPSupport, PlacardSupport, PlaybackSupport, RemainingTimeSupport, ScrubbingSupport, SkipBackSupport, StartSupport, StatusSupport, TracksSupport, VolumeSupport].map(SupportClass => {
return new SupportClass(this);
}, this);
}
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (209107 => 209108)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-11-30 01:58:48 UTC (rev 209107)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-11-30 02:26:04 UTC (rev 209108)
@@ -10019,6 +10019,8 @@
71004B9A1DC1109300A52A38 /* elapsed-time-support.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode._javascript_; path = "elapsed-time-support.js"; sourceTree = "<group>"; };
71004B9B1DC1109300A52A38 /* remaining-time-support.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode._javascript_; path = "remaining-time-support.js"; sourceTree = "<group>"; };
71004B9D1DC1398800A52A38 /* playback-support.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode._javascript_; path = "playback-support.js"; sourceTree = "<group>"; };
+ 710FA74B1DEE576D004C715E /* controls-bar.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode._javascript_; path = "controls-bar.js"; sourceTree = "<group>"; };
+ 710FA74C1DEE577E004C715E /* controls-visibility-support.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode._javascript_; path = "controls-visibility-support.js"; sourceTree = "<group>"; };
7117445614BC34E200EE5FC8 /* SVGTextMetricsBuilder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGTextMetricsBuilder.cpp; sourceTree = "<group>"; };
7117445714BC34E200EE5FC8 /* SVGTextMetricsBuilder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGTextMetricsBuilder.h; sourceTree = "<group>"; };
7118FED215685CC60030B79A /* JSSVGViewSpec.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSSVGViewSpec.cpp; sourceTree = "<group>"; };
@@ -18053,6 +18055,7 @@
716FA0DD1DB26591007323CC /* button.js */,
716FA0DE1DB26591007323CC /* buttons-container.css */,
716FA0DF1DB26591007323CC /* buttons-container.js */,
+ 710FA74B1DEE576D004C715E /* controls-bar.js */,
716FA0E01DB26591007323CC /* forward-button.js */,
716FA0E11DB26591007323CC /* fullscreen-button.js */,
716FA0E21DB26591007323CC /* icon-button.css */,
@@ -18101,6 +18104,7 @@
isa = PBXGroup;
children = (
717F90581DC4BB600006F520 /* airplay-support.js */,
+ 710FA74C1DEE577E004C715E /* controls-visibility-support.js */,
71004B9A1DC1109300A52A38 /* elapsed-time-support.js */,
714131471DC9D6AF00336107 /* fullscreen-support.js */,
7177E2461DB80D2F00919A0B /* media-controller-support.js */,