<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[213640] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/213640">213640</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2017-03-09 07:59:58 -0800 (Thu, 09 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Modern Media Controls] Controls are not visible in fullscreen without the controls attribute
https://bugs.webkit.org/show_bug.cgi?id=169411
<rdar://problem/30931724>
Patch by Antoine Quint <graouts@apple.com> on 2017-03-09
Reviewed by Eric Carlson.
Source/WebCore:
Ensure we show controls in fullscreen in the absence of the controls attribute.
Tests: 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.html
* Modules/modern-media-controls/media/controls-visibility-support.js:
(ControlsVisibilitySupport.prototype.get mediaEvents):
(ControlsVisibilitySupport.prototype._updateControls):
(ControlsVisibilitySupport):
LayoutTests:
Add two new tests to check that controls are visible in fullscreen in the absence of the controls attribute,
except if the fullscreen element is a parent element.
* media/modern-media-controls/controls-visibility-support/controls-visibility-support-fullscreen-on-parent-element.html: Added.
* media/modern-media-controls/controls-visibility-support/controls-visibility-support-fullscreen-on-video.html: Added.
* platform/ios-simulator/TestExpectations: Skip new tests on iOS since it uses platform controls.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformiossimulatorTestExpectations">trunk/LayoutTests/platform/ios-simulator/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmodernmediacontrolsmediacontrolsvisibilitysupportjs">trunk/Source/WebCore/Modules/modern-media-controls/media/controls-visibility-support.js</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolscontrolsvisibilitysupportcontrolsvisibilitysupportfullscreenonparentelementexpectedtxt">trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-fullscreen-on-parent-element-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolscontrolsvisibilitysupportcontrolsvisibilitysupportfullscreenonparentelementhtml">trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-fullscreen-on-parent-element.html</a></li>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolscontrolsvisibilitysupportcontrolsvisibilitysupportfullscreenonvideoexpectedtxt">trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-fullscreen-on-video-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolscontrolsvisibilitysupportcontrolsvisibilitysupportfullscreenonvideohtml">trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-fullscreen-on-video.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (213639 => 213640)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-03-09 15:25:12 UTC (rev 213639)
+++ trunk/LayoutTests/ChangeLog 2017-03-09 15:59:58 UTC (rev 213640)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2017-03-09 Antoine Quint <graouts@apple.com>
+
+ [Modern Media Controls] Controls are not visible in fullscreen without the controls attribute
+ https://bugs.webkit.org/show_bug.cgi?id=169411
+ <rdar://problem/30931724>
+
+ Reviewed by Eric Carlson.
+
+ Add two new tests to check that controls are visible in fullscreen in the absence of the controls attribute,
+ except if the fullscreen element is a parent element.
+
+ * media/modern-media-controls/controls-visibility-support/controls-visibility-support-fullscreen-on-parent-element.html: Added.
+ * media/modern-media-controls/controls-visibility-support/controls-visibility-support-fullscreen-on-video.html: Added.
+ * platform/ios-simulator/TestExpectations: Skip new tests on iOS since it uses platform controls.
+
</ins><span class="cx"> 2017-03-09 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Simple line layout: Add top level pagination support.
</span></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolscontrolsvisibilitysupportcontrolsvisibilitysupportfullscreenonparentelementexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-fullscreen-on-parent-element-expected.txt (0 => 213640)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-fullscreen-on-parent-element-expected.txt (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-fullscreen-on-parent-element-expected.txt 2017-03-09 15:59:58 UTC (rev 213640)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+Testing that control are not shown when a parent element is fullscreen and the controls attribute is not present.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS document.webkitFullscreenElement is document.documentElement
+PASS media.webkitDisplayingFullscreen is false
+PASS mediaController.controls.controlsBar.visible is false
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolscontrolsvisibilitysupportcontrolsvisibilitysupportfullscreenonparentelementhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-fullscreen-on-parent-element.html (0 => 213640)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-fullscreen-on-parent-element.html (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-fullscreen-on-parent-element.html 2017-03-09 15:59:58 UTC (rev 213640)
</span><span class="lines">@@ -0,0 +1,35 @@
</span><ins>+<script src="../../../resources/js-test-pre.js"></script>
+<script src="../resources/media-controls-loader.js" type="text/javascript"></script>
+<script src="../resources/media-controls-utils.js" type="text/javascript"></script>
+<body>
+<video src="../../content/test.mp4" autoplay></video>
+<div id="host"></div>
+<script type="text/javascript">
+
+window.jsTestIsAsync = true;
+
+description("Testing that control are not shown when a parent element is fullscreen and the controls attribute is not present.");
+
+const container = document.querySelector("div#host");
+const media = document.querySelector("video");
+const mediaController = createControls(container, media, null);
+
+media.addEventListener("play", () => {
+ document.documentElement.addEventListener("webkitfullscreenchange", () => {
+ shouldBe("document.webkitFullscreenElement", "document.documentElement");
+ shouldBeFalse("media.webkitDisplayingFullscreen");
+ shouldBeFalse("mediaController.controls.controlsBar.visible");
+ button.remove();
+ container.remove();
+ media.remove();
+ finishJSTest();
+ });
+
+ const button = document.body.appendChild(document.createElement("button"));
+ button.addEventListener("click", () => document.documentElement.webkitRequestFullscreen());
+ pressOnElement(button);
+});
+
+</script>
+<script src="../../../resources/js-test-post.js"></script>
+</body>
</ins></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolscontrolsvisibilitysupportcontrolsvisibilitysupportfullscreenonvideoexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-fullscreen-on-video-expected.txt (0 => 213640)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-fullscreen-on-video-expected.txt (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-fullscreen-on-video-expected.txt 2017-03-09 15:59:58 UTC (rev 213640)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+Testing that control are shown in fullscreen when the controls attribute is not present.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS media.webkitDisplayingFullscreen is true
+PASS mediaController.controls.controlsBar.visible is true
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolscontrolsvisibilitysupportcontrolsvisibilitysupportfullscreenonvideohtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-fullscreen-on-video.html (0 => 213640)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-fullscreen-on-video.html (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-fullscreen-on-video.html 2017-03-09 15:59:58 UTC (rev 213640)
</span><span class="lines">@@ -0,0 +1,34 @@
</span><ins>+<script src="../../../resources/js-test-pre.js"></script>
+<script src="../resources/media-controls-loader.js" type="text/javascript"></script>
+<script src="../resources/media-controls-utils.js" type="text/javascript"></script>
+<body>
+<video src="../../content/test.mp4" autoplay></video>
+<div id="host"></div>
+<script type="text/javascript">
+
+window.jsTestIsAsync = true;
+
+description("Testing that control are shown in fullscreen when the controls attribute is not present.");
+
+const container = document.querySelector("div#host");
+const media = document.querySelector("video");
+const mediaController = createControls(container, media, null);
+
+media.addEventListener("play", () => {
+ media.addEventListener("webkitfullscreenchange", () => {
+ shouldBeTrue("media.webkitDisplayingFullscreen");
+ shouldBeTrue("mediaController.controls.controlsBar.visible");
+ button.remove();
+ container.remove();
+ media.remove();
+ finishJSTest();
+ });
+
+ const button = document.body.appendChild(document.createElement("button"));
+ button.addEventListener("click", () => media.webkitEnterFullscreen());
+ pressOnElement(button);
+});
+
+</script>
+<script src="../../../resources/js-test-post.js"></script>
+</body>
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatorTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/ios-simulator/TestExpectations (213639 => 213640)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator/TestExpectations 2017-03-09 15:25:12 UTC (rev 213639)
+++ trunk/LayoutTests/platform/ios-simulator/TestExpectations 2017-03-09 15:59:58 UTC (rev 213640)
</span><span class="lines">@@ -2800,6 +2800,9 @@
</span><span class="cx"> media/modern-media-controls/start-support/start-support-fullscreen.html [ Skip ]
</span><span class="cx"> media/modern-media-controls/volume-down-support [ Skip ]
</span><span class="cx"> media/modern-media-controls/volume-up-support [ Skip ]
</span><ins>+media/modern-media-controls/volume-up-support [ Skip ]
+media/modern-media-controls/controls-visibility-support/controls-visibility-support-fullscreen-on-video.html [ Skip ]
+media/modern-media-controls/controls-visibility-support/controls-visibility-support-fullscreen-on-parent-element.html [ Skip ]
</ins><span class="cx">
</span><span class="cx"> # These tests are macOS-specific or mouse-specific
</span><span class="cx"> media/modern-media-controls/media-controller/media-controller-auto-hide-mouse-leave-after-play.html [ Skip ]
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (213639 => 213640)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-03-09 15:25:12 UTC (rev 213639)
+++ trunk/Source/WebCore/ChangeLog 2017-03-09 15:59:58 UTC (rev 213640)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2017-03-09 Antoine Quint <graouts@apple.com>
+
+ [Modern Media Controls] Controls are not visible in fullscreen without the controls attribute
+ https://bugs.webkit.org/show_bug.cgi?id=169411
+ <rdar://problem/30931724>
+
+ Reviewed by Eric Carlson.
+
+ Ensure we show controls in fullscreen in the absence of the controls attribute.
+
+ Tests: 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.html
+
+ * Modules/modern-media-controls/media/controls-visibility-support.js:
+ (ControlsVisibilitySupport.prototype.get mediaEvents):
+ (ControlsVisibilitySupport.prototype._updateControls):
+ (ControlsVisibilitySupport):
+
</ins><span class="cx"> 2017-03-09 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Simple line layout: Add top level pagination support.
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmodernmediacontrolsmediacontrolsvisibilitysupportjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/modern-media-controls/media/controls-visibility-support.js (213639 => 213640)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/modern-media-controls/media/controls-visibility-support.js 2017-03-09 15:25:12 UTC (rev 213639)
+++ trunk/Source/WebCore/Modules/modern-media-controls/media/controls-visibility-support.js 2017-03-09 15:59:58 UTC (rev 213640)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx">
</span><span class="cx"> get mediaEvents()
</span><span class="cx"> {
</span><del>- return ["loadedmetadata", "play", "pause"];
</del><ins>+ return ["loadedmetadata", "play", "pause", "webkitfullscreenchange"];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> get tracksToMonitor()
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx"> {
</span><span class="cx"> const media = this.mediaController.media;
</span><span class="cx"> const host = this.mediaController.host;
</span><del>- const shouldShowControls = !!(media.controls || (host && host.shouldForceControlsDisplay));
</del><ins>+ const shouldShowControls = !!(media.controls || (host && host.shouldForceControlsDisplay) || media.webkitDisplayingFullscreen);
</ins><span class="cx"> const isVideo = media instanceof HTMLVideoElement && media.videoTracks.length > 0;
</span><span class="cx">
</span><span class="cx"> const controls = this.mediaController.controls;
</span></span></pre>
</div>
</div>
</body>
</html>