Diff
Modified: trunk/LayoutTests/ChangeLog (208453 => 208454)
--- trunk/LayoutTests/ChangeLog 2016-11-09 19:20:54 UTC (rev 208453)
+++ trunk/LayoutTests/ChangeLog 2016-11-09 19:31:25 UTC (rev 208454)
@@ -1,3 +1,27 @@
+2016-11-08 Antoine Quint <[email protected]>
+
+ [Modern Media Controls] UI Library: iOS inline controls
+ https://bugs.webkit.org/show_bug.cgi?id=164513
+ <rdar://problem/27989475>
+
+ Reviewed by Dean Jackson.
+
+ Adding new tests for the IOSInlineMediaControls class.
+
+ * media/modern-media-controls/ios-inline-media-controls/ios-inline-media-controls-buttons-styles-expected.txt: Added.
+ * media/modern-media-controls/ios-inline-media-controls/ios-inline-media-controls-buttons-styles.html: Added.
+ * media/modern-media-controls/ios-inline-media-controls/ios-inline-media-controls-constructor-expected.txt: Added.
+ * media/modern-media-controls/ios-inline-media-controls/ios-inline-media-controls-constructor.html: Added.
+ * media/modern-media-controls/ios-inline-media-controls/ios-inline-media-controls-controls-bar-styles-expected.txt: Added.
+ * media/modern-media-controls/ios-inline-media-controls/ios-inline-media-controls-controls-bar-styles.html: Added.
+ * media/modern-media-controls/ios-inline-media-controls/ios-inline-media-controls-layout-expected.txt: Added.
+ * media/modern-media-controls/ios-inline-media-controls/ios-inline-media-controls-layout.html: Added.
+ * media/modern-media-controls/ios-inline-media-controls/ios-inline-media-controls-time-control-styles-expected.txt: Added.
+ * media/modern-media-controls/ios-inline-media-controls/ios-inline-media-controls-time-control-styles.html: Added.
+ * media/modern-media-controls/ios-inline-media-controls/ios-inline-media-dropping-controls-expected.txt: Added.
+ * media/modern-media-controls/ios-inline-media-controls/ios-inline-media-dropping-controls.html: Added.
+ * media/modern-media-controls/resources/media-controls-loader.js:
+
2016-11-09 Simon Fraser <[email protected]>
LayoutTest fast/visual-viewport/rtl-zoomed-rects.html failing
Added: trunk/LayoutTests/media/modern-media-controls/ios-inline-media-controls/ios-inline-media-controls-buttons-styles-expected.txt (0 => 208454)
--- trunk/LayoutTests/media/modern-media-controls/ios-inline-media-controls/ios-inline-media-controls-buttons-styles-expected.txt (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/ios-inline-media-controls/ios-inline-media-controls-buttons-styles-expected.txt 2016-11-09 19:31:25 UTC (rev 208454)
@@ -0,0 +1,49 @@
+Testing the IOSInlineMediaControls computed styles.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PlayPauseButton
+PASS rgba(style.backgroundColor).r is 0
+PASS rgba(style.backgroundColor).g is 0
+PASS rgba(style.backgroundColor).b is 0
+PASS rgba(style.backgroundColor).a is within 0.001 of 0
+PASS style.height is "50px"
+PASS style.webkitMaskPositionY is "12px"
+
+SkipBackButton
+PASS rgba(style.backgroundColor).r is 0
+PASS rgba(style.backgroundColor).g is 0
+PASS rgba(style.backgroundColor).b is 0
+PASS rgba(style.backgroundColor).a is within 0.001 of 0
+PASS style.height is "50px"
+PASS style.webkitMaskPositionY is "10px"
+
+AirplayButton
+PASS rgba(style.backgroundColor).r is 0
+PASS rgba(style.backgroundColor).g is 0
+PASS rgba(style.backgroundColor).b is 0
+PASS rgba(style.backgroundColor).a is within 0.001 of 0
+PASS style.height is "50px"
+PASS style.webkitMaskPositionY is "13px"
+
+PiPButton
+PASS rgba(style.backgroundColor).r is 0
+PASS rgba(style.backgroundColor).g is 0
+PASS rgba(style.backgroundColor).b is 0
+PASS rgba(style.backgroundColor).a is within 0.001 of 0
+PASS style.height is "50px"
+PASS style.webkitMaskPositionY is "13px"
+
+FullscreenButton
+PASS rgba(style.backgroundColor).r is 0
+PASS rgba(style.backgroundColor).g is 0
+PASS rgba(style.backgroundColor).b is 0
+PASS rgba(style.backgroundColor).a is within 0.001 of 0
+PASS style.height is "50px"
+PASS style.webkitMaskPositionY is "13px"
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
Added: trunk/LayoutTests/media/modern-media-controls/ios-inline-media-controls/ios-inline-media-controls-buttons-styles.html (0 => 208454)
--- trunk/LayoutTests/media/modern-media-controls/ios-inline-media-controls/ios-inline-media-controls-buttons-styles.html (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/ios-inline-media-controls/ios-inline-media-controls-buttons-styles.html 2016-11-09 19:31:25 UTC (rev 208454)
@@ -0,0 +1,42 @@
+<script src=""
+<script src="" type="text/_javascript_"></script>
+<script src="" type="text/_javascript_"></script>
+<body>
+<script type="text/_javascript_">
+
+description("Testing the <code>IOSInlineMediaControls</code> computed styles.");
+
+window.jsTestIsAsync = true;
+
+const mediaControls = new IOSInlineMediaControls({ width: 680, height: 300 });
+
+const buttonPositions = [
+ [mediaControls.playPauseButton, 12],
+ [mediaControls.skipBackButton, 10],
+ [mediaControls.airplayButton, 13],
+ [mediaControls.pipButton, 13],
+ [mediaControls.fullscreenButton, 13]
+];
+
+let style;
+scheduler.frameDidFire = function()
+{
+ document.body.appendChild(mediaControls.element);
+
+ for (let [button, y] of buttonPositions) {
+ style = window.getComputedStyle(button.element);
+ debug(button.constructor.name);
+ shouldBeEqualToRGBAColor("style.backgroundColor", "rgb(0, 0, 0)");
+ shouldBeEqualToString("style.height", "50px");
+ shouldBeEqualToString("style.webkitMaskPositionY", `${y}px`);
+ debug("");
+ }
+
+ mediaControls.element.remove();
+
+ finishJSTest();
+};
+
+</script>
+<script src=""
+</body>
Added: trunk/LayoutTests/media/modern-media-controls/ios-inline-media-controls/ios-inline-media-controls-constructor-expected.txt (0 => 208454)
--- trunk/LayoutTests/media/modern-media-controls/ios-inline-media-controls/ios-inline-media-controls-constructor-expected.txt (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/ios-inline-media-controls/ios-inline-media-controls-constructor-expected.txt 2016-11-09 19:31:25 UTC (rev 208454)
@@ -0,0 +1,30 @@
+Testing the IOSInlineMediaControls constructor.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS mediaControls.element.localName is "div"
+PASS mediaControls.element.className is "media-controls ios inline"
+PASS mediaControls.layoutTraits is LayoutTraits.iOS
+
+Controls bar
+PASS mediaControls.controlsBar.children.length is 2
+PASS mediaControls.controlsBar.children[0] instanceof ButtonsContainer is true
+PASS mediaControls.controlsBar.children[1] instanceof ButtonsContainer is true
+
+Left container
+PASS mediaControls.controlsBar.children[0].buttons is [mediaControls.playPauseButton, mediaControls.skipBackButton]
+PASS mediaControls.controlsBar.children[0].element.className is "buttons-container left"
+PASS mediaControls.controlsBar.children[0].padding is 24
+PASS mediaControls.controlsBar.children[0].margin is 24
+
+Right container
+PASS mediaControls.controlsBar.children[1].buttons is [mediaControls.airplayButton, mediaControls.pipButton, mediaControls.fullscreenButton]
+PASS mediaControls.controlsBar.children[1].element.className is "buttons-container right"
+PASS mediaControls.controlsBar.children[1].padding is 24
+PASS mediaControls.controlsBar.children[1].margin is 24
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
Added: trunk/LayoutTests/media/modern-media-controls/ios-inline-media-controls/ios-inline-media-controls-constructor.html (0 => 208454)
--- trunk/LayoutTests/media/modern-media-controls/ios-inline-media-controls/ios-inline-media-controls-constructor.html (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/ios-inline-media-controls/ios-inline-media-controls-constructor.html 2016-11-09 19:31:25 UTC (rev 208454)
@@ -0,0 +1,38 @@
+<script src=""
+<script src="" type="text/_javascript_"></script>
+<body>
+<script type="text/_javascript_">
+
+description("Testing the <code>IOSInlineMediaControls</code> constructor.");
+
+const mediaControls = new IOSInlineMediaControls;
+
+shouldBeEqualToString("mediaControls.element.localName", "div");
+shouldBeEqualToString("mediaControls.element.className", "media-controls ios inline");
+shouldBe("mediaControls.layoutTraits", "LayoutTraits.iOS");
+
+debug("");
+debug("Controls bar");
+shouldBe("mediaControls.controlsBar.children.length", "2");
+shouldBeTrue("mediaControls.controlsBar.children[0] instanceof ButtonsContainer");
+shouldBeTrue("mediaControls.controlsBar.children[1] instanceof ButtonsContainer");
+
+debug("");
+debug("Left container");
+shouldBe("mediaControls.controlsBar.children[0].buttons", "[mediaControls.playPauseButton, mediaControls.skipBackButton]");
+shouldBeEqualToString("mediaControls.controlsBar.children[0].element.className", "buttons-container left");
+shouldBe("mediaControls.controlsBar.children[0].padding", "24");
+shouldBe("mediaControls.controlsBar.children[0].margin", "24");
+
+debug("");
+debug("Right container");
+shouldBe("mediaControls.controlsBar.children[1].buttons", "[mediaControls.airplayButton, mediaControls.pipButton, mediaControls.fullscreenButton]");
+shouldBeEqualToString("mediaControls.controlsBar.children[1].element.className", "buttons-container right");
+shouldBe("mediaControls.controlsBar.children[1].padding", "24");
+shouldBe("mediaControls.controlsBar.children[1].margin", "24");
+
+debug("");
+
+</script>
+<script src=""
+</body>
Added: trunk/LayoutTests/media/modern-media-controls/ios-inline-media-controls/ios-inline-media-controls-controls-bar-styles-expected.txt (0 => 208454)
--- trunk/LayoutTests/media/modern-media-controls/ios-inline-media-controls/ios-inline-media-controls-controls-bar-styles-expected.txt (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/ios-inline-media-controls/ios-inline-media-controls-controls-bar-styles-expected.txt 2016-11-09 19:31:25 UTC (rev 208454)
@@ -0,0 +1,18 @@
+Testing the IOSInlineMediaControls computed styles.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS style.left is "0px"
+PASS style.bottom is "0px"
+PASS style.width is "680px"
+PASS style.height is "50px"
+PASS bounds.left is 0
+PASS bounds.top is 250
+PASS bounds.width is 680
+PASS bounds.height is 50
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
Added: trunk/LayoutTests/media/modern-media-controls/ios-inline-media-controls/ios-inline-media-controls-controls-bar-styles.html (0 => 208454)
--- trunk/LayoutTests/media/modern-media-controls/ios-inline-media-controls/ios-inline-media-controls-controls-bar-styles.html (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/ios-inline-media-controls/ios-inline-media-controls-controls-bar-styles.html 2016-11-09 19:31:25 UTC (rev 208454)
@@ -0,0 +1,48 @@
+<script src=""
+<script src="" type="text/_javascript_"></script>
+<script src="" type="text/_javascript_"></script>
+<body>
+<style type="text/css" media="screen">
+
+.media-controls {
+ position: absolute;
+ top: 0;
+ left: 0;
+}
+
+</style>
+<script type="text/_javascript_">
+
+description("Testing the <code>IOSInlineMediaControls</code> computed styles.");
+
+window.jsTestIsAsync = true;
+
+const mediaControls = new IOSInlineMediaControls({ width: 680, height: 300 });
+
+let style, bounds;
+scheduler.frameDidFire = function()
+{
+ document.body.appendChild(mediaControls.element);
+
+ style = window.getComputedStyle(mediaControls.controlsBar.element);
+ bounds = mediaControls.controlsBar.element.getBoundingClientRect();
+
+ shouldBeEqualToString("style.left", "0px");
+ shouldBeEqualToString("style.bottom", "0px");
+ shouldBeEqualToString("style.width", "680px");
+ shouldBeEqualToString("style.height", "50px");
+
+ shouldBe("bounds.left", "0");
+ shouldBe("bounds.top", "250");
+ shouldBe("bounds.width", "680");
+ shouldBe("bounds.height", "50");
+
+ mediaControls.element.remove();
+
+ debug("");
+ finishJSTest();
+};
+
+</script>
+<script src=""
+</body>
Added: trunk/LayoutTests/media/modern-media-controls/ios-inline-media-controls/ios-inline-media-controls-layout-expected.txt (0 => 208454)
--- trunk/LayoutTests/media/modern-media-controls/ios-inline-media-controls/ios-inline-media-controls-layout-expected.txt (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/ios-inline-media-controls/ios-inline-media-controls-layout-expected.txt 2016-11-09 19:31:25 UTC (rev 208454)
@@ -0,0 +1,16 @@
+Testing the IOSInlineMediaControls layout.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS mediaControls.controlsBar.children[0] instanceof ButtonsContainer is true
+PASS mediaControls.controlsBar.children[1] instanceof LayoutNode is true
+PASS mediaControls.controlsBar.children[2] instanceof ButtonsContainer is true
+PASS mediaControls.timeControl.x is 118
+PASS mediaControls.timeControl.width is 393
+PASS mediaControls.controlsBar.children[0].children is [mediaControls.playPauseButton, mediaControls.skipBackButton]
+PASS mediaControls.controlsBar.children[2].children is [mediaControls.airplayButton, mediaControls.pipButton, mediaControls.fullscreenButton]
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
Added: trunk/LayoutTests/media/modern-media-controls/ios-inline-media-controls/ios-inline-media-controls-layout.html (0 => 208454)
--- trunk/LayoutTests/media/modern-media-controls/ios-inline-media-controls/ios-inline-media-controls-layout.html (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/ios-inline-media-controls/ios-inline-media-controls-layout.html 2016-11-09 19:31:25 UTC (rev 208454)
@@ -0,0 +1,41 @@
+<script src=""
+<script src="" type="text/_javascript_"></script>
+<body>
+<script type="text/_javascript_">
+
+description("Testing the <code>IOSInlineMediaControls</code> layout.");
+
+window.jsTestIsAsync = true;
+
+const mediaControls = new IOSInlineMediaControls({ width: 680, height: 50 });
+
+const iconButtons = [
+ mediaControls.playPauseButton,
+ mediaControls.skipBackButton,
+ mediaControls.airplayButton,
+ mediaControls.pipButton,
+ mediaControls.fullscreenButton
+];
+
+scheduler.frameDidFire = function()
+{
+ if (iconButtons.some(button => button.width == 0))
+ return;
+
+ shouldBeTrue("mediaControls.controlsBar.children[0] instanceof ButtonsContainer");
+ shouldBeTrue("mediaControls.controlsBar.children[1] instanceof LayoutNode");
+ shouldBeTrue("mediaControls.controlsBar.children[2] instanceof ButtonsContainer");
+
+ shouldBe("mediaControls.timeControl.x", "118");
+
+ shouldBe("mediaControls.timeControl.width", "393");
+
+ shouldBe("mediaControls.controlsBar.children[0].children", "[mediaControls.playPauseButton, mediaControls.skipBackButton]");
+ shouldBe("mediaControls.controlsBar.children[2].children", "[mediaControls.airplayButton, mediaControls.pipButton, mediaControls.fullscreenButton]");
+
+ finishJSTest();
+};
+
+</script>
+<script src=""
+</body>
Added: trunk/LayoutTests/media/modern-media-controls/ios-inline-media-controls/ios-inline-media-controls-time-control-styles-expected.txt (0 => 208454)
--- trunk/LayoutTests/media/modern-media-controls/ios-inline-media-controls/ios-inline-media-controls-time-control-styles-expected.txt (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/ios-inline-media-controls/ios-inline-media-controls-time-control-styles-expected.txt 2016-11-09 19:31:25 UTC (rev 208454)
@@ -0,0 +1,13 @@
+Testing the IOSOSInlineMediaControls computed styles.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS window.getComputedStyle(mediaControls.timeControl.scrubber.element).top is "23px"
+PASS window.getComputedStyle(mediaControls.timeControl.elapsedTimeLabel.element).top is "14.5px"
+PASS window.getComputedStyle(mediaControls.timeControl.remainingTimeLabel.element).top is "14.5px"
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
Added: trunk/LayoutTests/media/modern-media-controls/ios-inline-media-controls/ios-inline-media-controls-time-control-styles.html (0 => 208454)
--- trunk/LayoutTests/media/modern-media-controls/ios-inline-media-controls/ios-inline-media-controls-time-control-styles.html (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/ios-inline-media-controls/ios-inline-media-controls-time-control-styles.html 2016-11-09 19:31:25 UTC (rev 208454)
@@ -0,0 +1,29 @@
+<script src=""
+<script src="" type="text/_javascript_"></script>
+<script src="" type="text/_javascript_"></script>
+<body>
+<script type="text/_javascript_">
+
+description("Testing the <code>IOSOSInlineMediaControls</code> computed styles.");
+
+window.jsTestIsAsync = true;
+
+const mediaControls = new IOSInlineMediaControls({ width: 680, height: 300 });
+
+scheduler.frameDidFire = function()
+{
+ document.body.appendChild(mediaControls.element);
+
+ shouldBeEqualToString("window.getComputedStyle(mediaControls.timeControl.scrubber.element).top", "23px");
+ shouldBeEqualToString("window.getComputedStyle(mediaControls.timeControl.elapsedTimeLabel.element).top", "14.5px");
+ shouldBeEqualToString("window.getComputedStyle(mediaControls.timeControl.remainingTimeLabel.element).top", "14.5px");
+ debug("");
+
+ mediaControls.element.remove();
+
+ finishJSTest();
+};
+
+</script>
+<script src=""
+</body>
Added: trunk/LayoutTests/media/modern-media-controls/ios-inline-media-controls/ios-inline-media-dropping-controls-expected.txt (0 => 208454)
--- trunk/LayoutTests/media/modern-media-controls/ios-inline-media-controls/ios-inline-media-dropping-controls-expected.txt (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/ios-inline-media-controls/ios-inline-media-dropping-controls-expected.txt 2016-11-09 19:31:25 UTC (rev 208454)
@@ -0,0 +1,24 @@
+Testing IOSInlineMediaControls and dropping controls.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+TimeControl is visible
+TimeControl is not visible
+
+AirplayButton is visible
+AirplayButton is not visible
+
+PiPButton is visible
+PiPButton is not visible
+
+SkipBackButton is visible
+SkipBackButton is not visible
+
+FullscreenButton is visible
+FullscreenButton is not visible
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
Added: trunk/LayoutTests/media/modern-media-controls/ios-inline-media-controls/ios-inline-media-dropping-controls.html (0 => 208454)
--- trunk/LayoutTests/media/modern-media-controls/ios-inline-media-controls/ios-inline-media-dropping-controls.html (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/ios-inline-media-controls/ios-inline-media-dropping-controls.html 2016-11-09 19:31:25 UTC (rev 208454)
@@ -0,0 +1,60 @@
+<script src=""
+<script src="" type="text/_javascript_"></script>
+<body>
+<script type="text/_javascript_">
+
+description("Testing <code>IOSInlineMediaControls</code> and dropping controls.");
+
+window.jsTestIsAsync = true;
+
+const mediaControls = new IOSInlineMediaControls;
+
+// There is a 4-pixel difference in metrics between 1x and 2x due to the volume button having a different width.
+const expectedWidthsForDrop = [
+ [mediaControls.timeControl, 548],
+ [mediaControls.airplayButton, 287],
+ [mediaControls.pipButton, 238],
+ [mediaControls.skipBackButton, 187],
+ [mediaControls.fullscreenButton, 139]
+];
+
+function dumpControlVisibility(control)
+{
+ let visibilityString = "visible";
+ if (!control.parent)
+ visibilityString = "not " + visibilityString;
+ debug(`${control.constructor.name} is ${visibilityString}`);
+}
+
+const iconButtons = [
+ mediaControls.playPauseButton,
+ mediaControls.skipBackButton,
+ mediaControls.airplayButton,
+ mediaControls.pipButton,
+ mediaControls.fullscreenButton
+];
+
+scheduler.frameDidFire = function()
+{
+ if (iconButtons.some(button => button.width == 0))
+ return;
+
+ for (let [control, width] of expectedWidthsForDrop) {
+ mediaControls.width = width + 1;
+ mediaControls.layout();
+ dumpControlVisibility(control);
+
+ mediaControls.width = width;
+ mediaControls.layout();
+ dumpControlVisibility(control);
+
+ debug("");
+ }
+
+ scheduler.frameDidFire = new Function;
+ finishJSTest();
+};
+
+</script>
+<script src=""
+</body>
Modified: trunk/LayoutTests/media/modern-media-controls/resources/media-controls-loader.js (208453 => 208454)
--- trunk/LayoutTests/media/modern-media-controls/resources/media-controls-loader.js 2016-11-09 19:20:54 UTC (rev 208453)
+++ trunk/LayoutTests/media/modern-media-controls/resources/media-controls-loader.js 2016-11-09 19:31:25 UTC (rev 208454)
@@ -3,7 +3,7 @@
const layoutTestsPath = window.location.href.substr(0, window.location.href.indexOf("/LayoutTests/"));
const modulePath = layoutTestsPath ? layoutTestsPath + "/Source/WebCore/Modules/modern-media-controls" : "/modern-media-controls";
- ["media-controls", "scrubber", "volume-slider", "slider", "button", "start-button", "icon-button", "airplay-button", "time-label", "macos-inline-media-controls", "macos-fullscreen-media-controls", "buttons-container", "placard"].forEach(cssFile => {
+ ["media-controls", "scrubber", "volume-slider", "slider", "button", "start-button", "icon-button", "airplay-button", "time-label", "macos-inline-media-controls", "macos-fullscreen-media-controls", "ios-inline-media-controls", "buttons-container", "placard"].forEach(cssFile => {
document.write(`<link rel="stylesheet" type="text/css" href=""
});
Modified: trunk/Source/WebCore/ChangeLog (208453 => 208454)
--- trunk/Source/WebCore/ChangeLog 2016-11-09 19:20:54 UTC (rev 208453)
+++ trunk/Source/WebCore/ChangeLog 2016-11-09 19:31:25 UTC (rev 208454)
@@ -1,3 +1,44 @@
+2016-11-08 Antoine Quint <[email protected]>
+
+ [Modern Media Controls] UI Library: iOS inline controls
+ https://bugs.webkit.org/show_bug.cgi?id=164513
+ <rdar://problem/27989475>
+
+ Reviewed by Dean Jackson.
+
+ We introduce a new IOSInlineMediaControls class which can be used to instantiate media controls
+ for inline playback on iOS.
+
+ Tests: media/modern-media-controls/ios-inline-media-controls/ios-inline-media-controls-buttons-styles.html
+ media/modern-media-controls/ios-inline-media-controls/ios-inline-media-controls-constructor.html
+ media/modern-media-controls/ios-inline-media-controls/ios-inline-media-controls-controls-bar-styles.html
+ media/modern-media-controls/ios-inline-media-controls/ios-inline-media-controls-layout.html
+ media/modern-media-controls/ios-inline-media-controls/ios-inline-media-controls-time-control-styles.html
+ media/modern-media-controls/ios-inline-media-controls/ios-inline-media-dropping-controls.html
+
+ * Modules/modern-media-controls/controls/ios-inline-media-controls.css: Added.
+ (.media-controls.ios.inline > .controls-bar):
+ (.media-controls.ios.inline .time-control):
+ (.media-controls.ios.inline button):
+ (.media-controls.ios.inline button:active):
+ (.media-controls.ios.inline > .controls-bar button):
+ (.media-controls.ios.inline .buttons-container.right):
+ (.media-controls.ios.inline button.play-pause):
+ (.media-controls.ios.inline button.skip-back):
+ (.media-controls.ios.inline .scrubber.slider):
+ (.media-controls.ios.inline button.airplay):
+ (.media-controls.ios.inline button.pip):
+ (.media-controls.ios.inline button.fullscreen):
+ (.media-controls.ios.inline .time-label):
+ (.media-controls.ios.inline .scrubber.slider > .fill):
+ (.media-controls.ios.inline .scrubber.slider > input::-webkit-slider-thumb):
+ * Modules/modern-media-controls/controls/ios-inline-media-controls.js: Added.
+ (IOSInlineMediaControls.prototype.layout):
+ (IOSInlineMediaControls):
+ * Modules/modern-media-controls/images/iOS/[email protected]: Added.
+ * Modules/modern-media-controls/js-files:
+ * WebCore.xcodeproj/project.pbxproj:
+
2016-11-09 Beth Dakin <[email protected]>
Support TouchBar in WebKit
Added: trunk/Source/WebCore/Modules/modern-media-controls/controls/ios-inline-media-controls.css (0 => 208454)
--- trunk/Source/WebCore/Modules/modern-media-controls/controls/ios-inline-media-controls.css (rev 0)
+++ trunk/Source/WebCore/Modules/modern-media-controls/controls/ios-inline-media-controls.css 2016-11-09 19:31:25 UTC (rev 208454)
@@ -0,0 +1,126 @@
+/*
+ * 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.
+ */
+
+/* Controls bar */
+
+.media-controls.ios.inline > .controls-bar {
+ left: 0;
+ right: 0;
+ bottom: 0;
+ height: 50px;
+}
+
+.media-controls.ios.inline > .controls-bar:before {
+ content: "";
+ position: absolute;
+ left: 0;
+ top: 0;
+ width: 100%;
+ height: 100%;
+ -webkit-appearance: media-controls-light-bar-background;
+ will-change: transform;
+}
+
+.media-controls.ios.inline .time-control {
+ position: absolute;
+}
+
+/* Buttons */
+
+.media-controls.ios.inline button {
+ background-color: black;
+}
+
+.media-controls.ios.inline button:active {
+ background-color: white;
+}
+
+.media-controls.ios.inline > .controls-bar button {
+ height: 100% !important;
+}
+
+/* Make right container flush to the right */
+
+.media-controls.ios.inline .buttons-container.right {
+ right: 0;
+}
+
+/* Buttons placement */
+
+.media-controls.ios.inline button.play-pause {
+ -webkit-mask-position-y: 12px;
+}
+
+.media-controls.ios.inline button.skip-back {
+ -webkit-mask-position-y: 10px;
+}
+
+.media-controls.ios.inline .scrubber.slider {
+ top: 23px;
+}
+
+.media-controls.ios.inline button.airplay {
+ -webkit-mask-position-y: 13px;
+}
+
+.media-controls.ios.inline button.pip {
+ -webkit-mask-position-y: 13px;
+}
+
+.media-controls.ios.inline button.fullscreen {
+ -webkit-mask-position-y: 13px;
+}
+
+/* Time labels */
+
+.media-controls.ios.inline .time-label {
+ top: 14.5px;
+ color: black;
+}
+
+/* Scrubber */
+
+.media-controls.ios.inline .scrubber.slider {
+ background-color: black;
+}
+
+.media-controls.ios.inline .scrubber.slider > .fill {
+ background-color: white;
+}
+
+.media-controls.ios.inline .scrubber.slider > input::-webkit-slider-thumb {
+ width: 15px;
+ height: 50px;
+ background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB4AAAAiCAYAAABIiGl0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAxNpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMDE0IDc5LjE1Njc5NywgMjAxNC8wOC8yMC0wOTo1MzowMiAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iUGl4ZWxtYXRvciAyLjIiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6NTkwQ0UwODdBQTcxMTFFNEE5QTZGQTVGMjFBNkUxN0UiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6NTkwQ0UwODhBQTcxMTFFNEE5QTZGQTVGMjFBNkUxN0UiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1
wLmlpZDo1OTBDRTA4NUFBNzExMUU0QTlBNkZBNUYyMUE2RTE3RSIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDo1OTBDRTA4NkFBNzExMUU0QTlBNkZBNUYyMUE2RTE3RSIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/Pofoz4wAAAJGSURBVHjaxJfNTsJAEMfbLmoNaKIhIE18A+LReOXmi/gQnnwSLz6Fnjh4Id4kHElI5EDwpIkgImWdf/Nfs5ISCrR1kkmg7c5vZz/mw3WSy66oL7ojqqiQkPotOhGdaq1XGnMTvC+KlprN5kW9Xr8sFotnhUKhCsUHs9lsCB2NRu1Op3PfaDRa8vhDdCSqnQ0E3lX7/f6NGH7RCQXfYgzG0sZacthut6/G4/Gj3lAwFjZgKyn0qNfrXYdh+Ka3FNiALdhc6Sk+1CkL4Us997E0aXga5zmX3Y87vdVt9jTJnvPA/blJJZxEnbHwtJds8Mk6V2ZTAQMsAD1EJAQHpdSpk7GAARaYAPuISE5OQpYfeYwwmBeYrMhjZeJuHkKWAtj7B7DnJchQaQsylgvwHGktL6qwXsH0TE7NETw091gjiecFFtYzmNFSo3LICyysBzBxsI5xoWUJWllHL8lSfTnViFyTyGO4PhgMbrP2lgxNpnPAdBXkkBYDsg48lqbRDLrd7t18Pn9P21PYhG3zl8yoXsY+1zCjDEufgIxjMqPCHMm5wpdBBsVeQK2QpUzZs8dKsGY+SrG8DSxvj8j6DdOKHUPZhkO3KOiDBWiZDGW3MC4f7FPVYvKQyuE8YQvzFJMUcJg+qfit3YVKc4clqB8H3zAThWzmJmzstGN1fI511LVJXYzl7hZQ00F+2dA4sH3P7Am4a0zAeDklEODZYueoVgz+DS4rWk5tTdj2cmqt4tr9sccJFqyG3N4C
GxrSu3AZ0MiPAAMAZrLkuVVmRJsAAAAASUVORK5CYII=");
+ background-repeat: no-repeat;
+ background-size: 15px 17px;
+ background-position: 0px 18px;
+ background-color: transparent;
+ box-shadow: none;
+ border: none;
+}
+
+
+
Added: trunk/Source/WebCore/Modules/modern-media-controls/controls/ios-inline-media-controls.js (0 => 208454)
--- trunk/Source/WebCore/Modules/modern-media-controls/controls/ios-inline-media-controls.js (rev 0)
+++ trunk/Source/WebCore/Modules/modern-media-controls/controls/ios-inline-media-controls.js 2016-11-09 19:31:25 UTC (rev 208454)
@@ -0,0 +1,97 @@
+/*
+ * 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 IOSInlineMediaControls extends MediaControls
+{
+
+ constructor(options = {})
+ {
+ options.layoutTraits = LayoutTraits.iOS;
+
+ super(options);
+
+ this.element.classList.add("ios");
+ this.element.classList.add("inline");
+
+ this.element.appendChild(this.startButton.element);
+
+ this._leftContainer = new ButtonsContainer({
+ buttons: [this.playPauseButton, this.skipBackButton],
+ cssClassName: "left",
+ padding: 24,
+ margin: 24,
+ });
+
+ this._rightContainer = new ButtonsContainer({
+ buttons: [this.airplayButton, this.pipButton, this.fullscreenButton],
+ cssClassName: "right",
+ padding: 24,
+ margin: 24
+ });
+
+ this.controlsBar.children = [this._leftContainer, this._rightContainer];
+ }
+
+ // Public
+
+ layout()
+ {
+ super.layout();
+
+ // Reset dropped buttons.
+ for (let button of this._rightContainer.buttons)
+ delete button.dropped;
+
+ this._leftContainer.layout();
+ this._rightContainer.layout();
+
+ this.timeControl.width = this.width - this._leftContainer.width - this._rightContainer.width;
+
+ if (this.timeControl.isSufficientlyWide) {
+ this.controlsBar.insertBefore(this.timeControl, this._rightContainer);
+ this.timeControl.x = this._leftContainer.width;
+ } else {
+ this.timeControl.remove();
+ // Since we don't have enough space to display the scrubber, we may also not have
+ // enough space to display all buttons in the left and right containers, so gradually drop them.
+ for (let control of [this.airplayButton, this.pipButton, this.skipBackButton, this.fullscreenButton]) {
+ // Nothing left to do if the combined container widths is shorter than the available width.
+ if (this._leftContainer.width + this._rightContainer.width < this.width)
+ break;
+
+ // If the control was already not participating in layout, we can skip it.
+ if (!control.visible)
+ continue;
+
+ // This control must now be dropped.
+ control.dropped = true;
+
+ this._leftContainer.layout();
+ this._rightContainer.layout();
+ }
+ }
+ }
+
+}
Added: trunk/Source/WebCore/Modules/modern-media-controls/images/iOS/[email protected] (0 => 208454)
--- trunk/Source/WebCore/Modules/modern-media-controls/images/iOS/[email protected] (rev 0)
+++ trunk/Source/WebCore/Modules/modern-media-controls/images/iOS/[email protected] 2016-11-09 19:31:25 UTC (rev 208454)
@@ -0,0 +1,11 @@
+\x89PNG
+
++IHDR "H\x88ittEXtSoftwareAdobe ImageReadyq\xC9e<iTXtXML:com.adobe.xmp<?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?> <x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="Adobe XMP Core 5.6-c014 79.156797, 2014/08/20-09:53:02 "> <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> <rdf:Description rdf:about="" xmlns:xmp="http://ns.adobe.com/xap/1.0/" xmlns:xmpMM="http://ns.adobe.com/xap/1.0/mm/" xmlns:stRef="http://ns.adobe.com/xap/1.0/sType/ResourceRef#" xmp:CreatorTool="Pixelmator 2.2" xmpMM:InstanceID="xmp.iid:590CE087AA7111E4A9A6FA5F21A6E17E" xmpMM:DocumentID="xmp.did:590CE088AA7111E4A9A6FA5F21A6E17E"> <xmpMM:DerivedFrom stRef:instanceID="xmp.iid:590CE085AA7111E4A9A6FA5F21A6E17E" stRef:documentID="xmp.did:590CE086AA7111E4A9A6FA5F21A6E17E"/> </rdf:
Description> </rdf:RDF> </x:xmpmeta> <?xpacket end="r"?>\x87\xE8όFIDATx\xDAė\xCDN\xC2@\xC7\xDB.j+h\xA2! M|\xE2\xD1x\xE5\xE6\x8B\xF8\x9E|/>\x85\x9E8x!\xDE$ IH\xE4@\xF0\xA4\x89 "e\x9D\xF3_\xB3\x92
+\xB4u\x92I\xA0\xED\xCEog?\xE6\xC3u\x92ˮ\xA8/\xBA#\xAA\xA8\x90\x90\xFA-:\x9Dj\xADWs\xBC/\x8A\x96\x9A\xCD\xE6E\xBD^\xBF,\x8Bg\x85B\xA1
+\xC5\xB3\xD9l \x8DF\xEDN\xA7s\xDFh4Z\xF2\xF8Ct$\xAA\x9D+\xDEU\xFB\xFD\xFE\x8D~\xD1 \xDFb \xC6\xD2\xC6Zr\xD8n\xB7\xAF\xC6\xE3\xF1\xA3\xDEP06`+)\xF4\xA8\xD7\xEB]\x87a\xF8\xA6\xB7-\xD8\\xE9)>\xD4) \xE1K=\xF7\xB14ix\xE79\x97ݏ;\xBD\xD5m\xF64ɞ\xF3\xC0\xFD\xB9I%\x9CD\x9D\xB1\xF0\xB4\x97l\xF0\xC9:WfS,=D$\xA5ԩ\x93\xB1\x80\x98\xFB\x88HNNB\x96 y\x8C0\x98\x98\xAC\xC8ce\xE2n B\x96\xD8\xFB\xB0\xE7%\xC8Pi 2\x96 \xF0 i-/\xAA\xB0^\xC1\xF4LN\xCD<4\xF7X#\x89\xE7\xD63\x98\xD1R\xA3r\xC8 ,\xAC0q\xB0\x8Eq\xA1e ZYG/\xC9R}9Ո\\x93\xC8c\xB8> n\xB3\xF6\x96 M\xA6s\xC0t\xE4\x90\xB2<\x96\xA6\xD1 \xBA\xDD\xEE\xDD|>O\xDBSm\xF3\x97̨^\xC6>\xD70\xA3 K\x9F\x80\x8Cc2\xA3\xC2 ɹA\xC5^@\xAD\x90\xA5Lٳ\xC7J\xB0f>J\xB1\xBC+,o\x8F\xC8\xFA+ӊ CنC\xB7(\xE8\x83h\x99 e\xB70. \xECS\xD5b\xF2\x90\xCA\xE1<a \xF3\x93p\x98>\xA9\xF8\xAD݅Js\x87%\xA8 \xDF0\x85l\xE6&l\xEC\xB4cu|\x8EuԵI]\x8C\xE5\xEEP\xD3A~\xD9\xD08\xB0}\xCF\xEC \xB8kL\xC0x9%\xE0\xD
9b\xE7\xA8V \xFE+.+ZNmM\xD8\xF6rj\xAD\xE2\xDA\xFD\xB1\xC7 \xAC\x86\xDC\xDEһp\xD0ȏf\xB2\xE4\xB9UfD\x9BIEND\xAEB`\x82
\ No newline at end of file
Modified: trunk/Source/WebCore/Modules/modern-media-controls/js-files (208453 => 208454)
--- trunk/Source/WebCore/Modules/modern-media-controls/js-files 2016-11-09 19:20:54 UTC (rev 208453)
+++ trunk/Source/WebCore/Modules/modern-media-controls/js-files 2016-11-09 19:31:25 UTC (rev 208454)
@@ -20,11 +20,12 @@
controls/aspect-ratio-button.js
controls/rewind-button.js
controls/forward-button.js
+controls/buttons-container.js
controls/media-controls.js
+controls/ios-inline-media-controls.js
controls/macos-media-controls.js
controls/macos-inline-media-controls.js
controls/macos-fullscreen-media-controls.js
-controls/buttons-container.js
controls/placard.js
controls/airplay-placard.js
controls/pip-placard.js
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (208453 => 208454)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-11-09 19:20:54 UTC (rev 208453)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-11-09 19:31:25 UTC (rev 208454)
@@ -9882,6 +9882,9 @@
713E70AF1733E8B300A22D00 /* plugIns.js */ = {isa = PBXFileReference; lastKnownFileType = sourcecode._javascript_; path = plugIns.js; sourceTree = "<group>"; };
714131471DC9D6AF00336107 /* fullscreen-support.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode._javascript_; path = "fullscreen-support.js"; sourceTree = "<group>"; };
714131481DC9D6EF00336107 /* js-files */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "js-files"; sourceTree = "<group>"; };
+ 7152CEC11DD2235300FD5962 /* ios-inline-media-controls.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = "ios-inline-media-controls.css"; sourceTree = "<group>"; };
+ 7152CEC21DD2235300FD5962 /* ios-inline-media-controls.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode._javascript_; path = "ios-inline-media-controls.js"; sourceTree = "<group>"; };
+ 7152CEC31DD2236B00FD5962 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
715379FE146BD9D6008BD615 /* SVGPathData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGPathData.cpp; sourceTree = "<group>"; };
715379FF146BD9D6008BD615 /* SVGPathData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGPathData.h; sourceTree = "<group>"; };
7157E3D11DC1EE4B0094550E /* scrubbing-support.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode._javascript_; path = "scrubbing-support.js"; sourceTree = "<group>"; };
@@ -17869,6 +17872,8 @@
716FA0E21DB26591007323CC /* icon-button.css */,
716FA0E31DB26591007323CC /* icon-button.js */,
716FA0E41DB26591007323CC /* icon-service.js */,
+ 7152CEC11DD2235300FD5962 /* ios-inline-media-controls.css */,
+ 7152CEC21DD2235300FD5962 /* ios-inline-media-controls.js */,
716FA0E51DB26591007323CC /* layout-item.js */,
716FA0E61DB26591007323CC /* layout-node.js */,
712157C01DCCCA0700AA7A92 /* macos-fullscreen-media-controls.css */,
@@ -17972,6 +17977,7 @@
71D6AA881DA4EAF700B23969 /* [email protected] */,
71D6AA891DA4EAF700B23969 /* [email protected] */,
71D6AA8A1DA4EAF700B23969 /* [email protected] */,
+ 7152CEC31DD2236B00FD5962 /* [email protected] */,
71D6AA8C1DA4EAF700B23969 /* [email protected] */,
71D6AA8D1DA4EAF700B23969 /* [email protected] */,
71D6AA8E1DA4EAF700B23969 /* [email protected] */,
