Diff
Modified: trunk/LayoutTests/ChangeLog (209162 => 209163)
--- trunk/LayoutTests/ChangeLog 2016-12-01 00:10:44 UTC (rev 209162)
+++ trunk/LayoutTests/ChangeLog 2016-12-01 00:14:19 UTC (rev 209163)
@@ -1,3 +1,21 @@
+2016-11-30 Antoine Quint <[email protected]>
+
+ [Modern Media Controls] UI Library: <audio> controls
+ https://bugs.webkit.org/show_bug.cgi?id=164619
+ <rdar://problem/29207215>
+
+ Reviewed by Dean Jackson.
+
+ Add tests to check the default size of an <audio> element and which of
+ the media controls buttons are enabled in that case.
+
+ * media/modern-media-controls/audio/audio-controls-buttons-expected.txt: Added.
+ * media/modern-media-controls/audio/audio-controls-buttons.html: Added.
+ * media/modern-media-controls/audio/audio-controls-metrics-expected.txt: Added.
+ * media/modern-media-controls/audio/audio-controls-metrics.html: Added.
+ * platform/ios-simulator/TestExpectations:
+ * platform/mac/TestExpectations:
+
2016-11-30 Zalan Bujtas <[email protected]>
ASSERTION FAILED: layoutState->m_renderer == this in WebCore::RenderBlock::offsetFromLogicalTopOfFirstPage
Added: trunk/LayoutTests/media/modern-media-controls/audio/audio-controls-buttons-expected.txt (0 => 209163)
--- trunk/LayoutTests/media/modern-media-controls/audio/audio-controls-buttons-expected.txt (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/audio/audio-controls-buttons-expected.txt 2016-12-01 00:14:19 UTC (rev 209163)
@@ -0,0 +1,15 @@
+Testing the <audio> controls buttons.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Making AirPlay routes available.
+AirPlay routes became available.
+PASS mediaController.controls.controlsBar.children[2].children.length is 2
+PASS mediaController.controls.controlsBar.children[2].children[0] is mediaController.controls.muteButton
+PASS mediaController.controls.controlsBar.children[2].children[1] is mediaController.controls.airplayButton
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
Added: trunk/LayoutTests/media/modern-media-controls/audio/audio-controls-buttons.html (0 => 209163)
--- trunk/LayoutTests/media/modern-media-controls/audio/audio-controls-buttons.html (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/audio/audio-controls-buttons.html 2016-12-01 00:14:19 UTC (rev 209163)
@@ -0,0 +1,47 @@
+<script src=""
+<script src="" type="text/_javascript_"></script>
+<body>
+<audio src="" style="width: 600px; height: 50px;" autoplay controls></audio>
+<div id="container"></div>
+<script type="text/_javascript_">
+
+window.jsTestIsAsync = true;
+
+description("Testing the <code><audio></code> controls buttons.");
+
+const shadowRoot = document.querySelector("#container");
+const media = document.querySelector("audio");
+const mediaController = createControls(shadowRoot, media, null);
+
+window.internals.setMockMediaPlaybackTargetPickerEnabled(false);
+
+media.addEventListener("play", () => {
+ media.addEventListener("webkitplaybacktargetavailabilitychanged", playbackTargetAvailabilityChanged);
+
+ debug("Making AirPlay routes available.");
+ window.internals.setMockMediaPlaybackTargetPickerEnabled(true);
+});
+
+function playbackTargetAvailabilityChanged(event)
+{
+ if (event.availability != "available")
+ return;
+
+ debug("AirPlay routes became available.");
+
+ scheduler.frameDidFire = function()
+ {
+ shouldBe("mediaController.controls.controlsBar.children[2].children.length", "2");
+ shouldBe("mediaController.controls.controlsBar.children[2].children[0]", "mediaController.controls.muteButton");
+ shouldBe("mediaController.controls.controlsBar.children[2].children[1]", "mediaController.controls.airplayButton");
+
+ debug("");
+ shadowRoot.remove();
+ media.remove();
+ finishJSTest();
+ };
+}
+
+</script>
+<script src=""
+</body>
Added: trunk/LayoutTests/media/modern-media-controls/audio/audio-controls-metrics-expected.txt (0 => 209163)
--- trunk/LayoutTests/media/modern-media-controls/audio/audio-controls-metrics-expected.txt (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/audio/audio-controls-metrics-expected.txt 2016-12-01 00:14:19 UTC (rev 209163)
@@ -0,0 +1,12 @@
+Testing the <audio> controls metrics.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS bounds.width is 200
+PASS bounds.height is 50
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
Added: trunk/LayoutTests/media/modern-media-controls/audio/audio-controls-metrics.html (0 => 209163)
--- trunk/LayoutTests/media/modern-media-controls/audio/audio-controls-metrics.html (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/audio/audio-controls-metrics.html 2016-12-01 00:14:19 UTC (rev 209163)
@@ -0,0 +1,20 @@
+<!DOCTYPE html><!-- webkit-test-runner [ enableModernMediaControls=true ] -->
+<script src=""
+<body>
+<script type="text/_javascript_">
+
+description("Testing the <code><audio></code> controls metrics.");
+
+const audio = document.body.appendChild(document.createElement("audio"));
+audio.controls = true;
+
+const bounds = audio.getBoundingClientRect();
+shouldBe("bounds.width", "200");
+shouldBe("bounds.height", "50");
+
+debug("");
+audio.remove();
+
+</script>
+<script src=""
+</body>
Modified: trunk/LayoutTests/platform/ios-simulator/TestExpectations (209162 => 209163)
--- trunk/LayoutTests/platform/ios-simulator/TestExpectations 2016-12-01 00:10:44 UTC (rev 209162)
+++ trunk/LayoutTests/platform/ios-simulator/TestExpectations 2016-12-01 00:14:19 UTC (rev 209163)
@@ -2745,6 +2745,7 @@
media/modern-media-controls/airplay-support/airplay-support.html [ Skip ]
media/modern-media-controls/pip-support [ Skip ]
media/modern-media-controls/placard-support [ Skip ]
+media/modern-media-controls/audio [ Skip ]
# This test is Mac-specific since it checks that we have custom controls in fullscreen.
media/modern-media-controls/media-controller/media-controller-fullscreen-change.html [ Skip ]
Modified: trunk/LayoutTests/platform/mac/TestExpectations (209162 => 209163)
--- trunk/LayoutTests/platform/mac/TestExpectations 2016-12-01 00:10:44 UTC (rev 209162)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2016-12-01 00:14:19 UTC (rev 209163)
@@ -1450,6 +1450,7 @@
[ Yosemite ] media/modern-media-controls/airplay-support/airplay-support.html [ Skip ]
[ Yosemite ] media/modern-media-controls/pip-support [ Skip ]
[ Yosemite ] media/modern-media-controls/placard-support [ Skip ]
+[ Yosemite ] media/modern-media-controls/audio [ Skip ]
webkit.org/b/164616 http/tests/media/modern-media-controls/skip-back-support/skip-back-support-button-click.html [ Pass Failure ]
webkit.org/b/164323 media/modern-media-controls/airplay-support/airplay-support.html [ Pass Failure ]
Modified: trunk/Source/WebCore/ChangeLog (209162 => 209163)
--- trunk/Source/WebCore/ChangeLog 2016-12-01 00:10:44 UTC (rev 209162)
+++ trunk/Source/WebCore/ChangeLog 2016-12-01 00:14:19 UTC (rev 209163)
@@ -1,3 +1,19 @@
+2016-11-30 Antoine Quint <[email protected]>
+
+ [Modern Media Controls] UI Library: <audio> controls
+ https://bugs.webkit.org/show_bug.cgi?id=164619
+ <rdar://problem/29207215>
+
+ Reviewed by Dean Jackson.
+
+ Add a default size for <audio> elements (200x50).
+
+ Tests: media/modern-media-controls/audio/audio-controls-buttons.html
+ media/modern-media-controls/audio/audio-controls-metrics.html
+
+ * Modules/modern-media-controls/controls/media-controls.css:
+ (:host(audio)):
+
2016-11-30 Brady Eidson <[email protected]>
REGRESSION (r209144): API test IndexedDB.DeleteRecovery failing.
Modified: trunk/Source/WebCore/Modules/modern-media-controls/controls/media-controls.css (209162 => 209163)
--- trunk/Source/WebCore/Modules/modern-media-controls/controls/media-controls.css 2016-12-01 00:10:44 UTC (rev 209162)
+++ trunk/Source/WebCore/Modules/modern-media-controls/controls/media-controls.css 2016-12-01 00:14:19 UTC (rev 209163)
@@ -23,6 +23,11 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+:host(audio) {
+ width: 200px;
+ height: 50px;
+}
+
/* We need to use relative positioning due to webkit.org/b/163603 */
.media-controls {
position: relative;