<!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>[209228] 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/209228">209228</a></dd>
<dt>Author</dt> <dd>graouts@webkit.org</dd>
<dt>Date</dt> <dd>2016-12-01 18:11:05 -0800 (Thu, 01 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Modern Media Controls] Fade controls in when entering and exiting fullscreen
https://bugs.webkit.org/show_bug.cgi?id=165287
Reviewed by Dean Jackson.
Fade controls in when we enter and leave fullscreen.
Test: media/modern-media-controls/media-controller/media-controller-fade-controls-when-entering-fullscreen.html
* Modules/modern-media-controls/controls/media-controls.css:
(.media-controls.fade-in):
(@keyframes fade-in):
(to):
* Modules/modern-media-controls/controls/media-controls.js:
(MediaControls.prototype.presentInElement):
* Modules/modern-media-controls/media/fullscreen-support.js:
(FullscreenSupport.prototype.buttonWasClicked):
* Modules/modern-media-controls/media/media-controller.js:
(MediaController.prototype._updateControlsIfNeeded):</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="#trunkLayoutTestsplatformmacTestExpectations">trunk/LayoutTests/platform/mac/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmodernmediacontrolscontrolsmediacontrolscss">trunk/Source/WebCore/Modules/modern-media-controls/controls/media-controls.css</a></li>
<li><a href="#trunkSourceWebCoreModulesmodernmediacontrolscontrolsmediacontrolsjs">trunk/Source/WebCore/Modules/modern-media-controls/controls/media-controls.js</a></li>
<li><a href="#trunkSourceWebCoreModulesmodernmediacontrolsmediafullscreensupportjs">trunk/Source/WebCore/Modules/modern-media-controls/media/fullscreen-support.js</a></li>
<li><a href="#trunkSourceWebCoreModulesmodernmediacontrolsmediamediacontrollerjs">trunk/Source/WebCore/Modules/modern-media-controls/media/media-controller.js</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolsmediacontrollermediacontrollerfadecontrolswhenenteringfullscreenexpectedtxt">trunk/LayoutTests/media/modern-media-controls/media-controller/media-controller-fade-controls-when-entering-fullscreen-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolsmediacontrollermediacontrollerfadecontrolswhenenteringfullscreenhtml">trunk/LayoutTests/media/modern-media-controls/media-controller/media-controller-fade-controls-when-entering-fullscreen.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (209227 => 209228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-12-02 02:07:35 UTC (rev 209227)
+++ trunk/LayoutTests/ChangeLog 2016-12-02 02:11:05 UTC (rev 209228)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2016-12-01 Antoine Quint <graouts@apple.com>
</span><span class="cx">
</span><ins>+ [Modern Media Controls] Fade controls in when entering and exiting fullscreen
+ https://bugs.webkit.org/show_bug.cgi?id=165287
+
+ Reviewed by Dean Jackson.
+
+ Add a new Mac-specific test that checks that we fade controls in when entering fullscreen.
+
+ * media/modern-media-controls/media-controller/media-controller-fade-controls-when-entering-fullscreen-expected.txt: Added.
+ * media/modern-media-controls/media-controller/media-controller-fade-controls-when-entering-fullscreen.html: Added.
+ * platform/ios-simulator/TestExpectations:
+ * platform/mac/TestExpectations:
+
+2016-12-01 Antoine Quint <graouts@apple.com>
+
</ins><span class="cx"> [Modern Media Controls] Show and populate the tracks panel
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=165284
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolsmediacontrollermediacontrollerfadecontrolswhenenteringfullscreenexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/modern-media-controls/media-controller/media-controller-fade-controls-when-entering-fullscreen-expected.txt (0 => 209228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/media-controller/media-controller-fade-controls-when-entering-fullscreen-expected.txt (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/media-controller/media-controller-fade-controls-when-entering-fullscreen-expected.txt 2016-12-02 02:11:05 UTC (rev 209228)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+Fading in the controls when entering fullscreen.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+We should not fade the controls in when showing them inline the first time
+PASS shadowRoot.lastChild.classList.contains('fade-in') is false
+Clicking on the fullscreen button
+Obtained a webkitfullscreenchange event
+PASS media.webkitDisplayingFullscreen is true
+We should fade the controls in when showing them fullscreen
+PASS shadowRoot.lastChild.classList.contains('fade-in') is true
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolsmediacontrollermediacontrollerfadecontrolswhenenteringfullscreenhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/modern-media-controls/media-controller/media-controller-fade-controls-when-entering-fullscreen.html (0 => 209228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/media-controller/media-controller-fade-controls-when-entering-fullscreen.html (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/media-controller/media-controller-fade-controls-when-entering-fullscreen.html 2016-12-02 02:11:05 UTC (rev 209228)
</span><span class="lines">@@ -0,0 +1,46 @@
</span><ins>+<!DOCTYPE html><!-- webkit-test-runner [ enableModernMediaControls=true ] -->
+<script src="../../../resources/js-test-pre.js"></script>
+<body>
+<video src="../../content/test.mp4" style="width: 640px; height: 480px;" controls autoplay></video>
+<script type="text/javascript">
+
+window.jsTestIsAsync = true;
+
+description("Fading in the controls when entering fullscreen.");
+
+const media = document.querySelector("video");
+const shadowRoot = window.internals.shadowRoot(media);
+
+media.addEventListener("play", () => {
+ media.pause();
+
+ window.requestAnimationFrame(() => {
+ debug("We should not fade the controls in when showing them inline the first time");
+ shouldBeFalse("shadowRoot.lastChild.classList.contains('fade-in')");
+
+ clickOnFullscreenButton();
+ media.addEventListener("webkitfullscreenchange", () => {
+ debug("Obtained a webkitfullscreenchange event");
+ shouldBeTrue("media.webkitDisplayingFullscreen");
+ debug("We should fade the controls in when showing them fullscreen");
+ shouldBeTrue("shadowRoot.lastChild.classList.contains('fade-in')");
+
+ debug("");
+ media.remove();
+ finishJSTest();
+ });
+ });
+});
+
+function clickOnFullscreenButton()
+{
+ debug("Clicking on the fullscreen button");
+ const bounds = shadowRoot.lastChild.querySelector("button.fullscreen").getBoundingClientRect();
+ eventSender.mouseMoveTo(bounds.left + 1, bounds.top + 1);
+ eventSender.mouseDown();
+ eventSender.mouseUp();
+}
+
+</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 (209227 => 209228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator/TestExpectations 2016-12-02 02:07:35 UTC (rev 209227)
+++ trunk/LayoutTests/platform/ios-simulator/TestExpectations 2016-12-02 02:11:05 UTC (rev 209228)
</span><span class="lines">@@ -2751,6 +2751,7 @@
</span><span class="cx"> # Mac-specific tests for fullscreen.
</span><span class="cx"> media/modern-media-controls/media-controller/media-controller-fullscreen-change.html [ Skip ]
</span><span class="cx"> media/modern-media-controls/media-controller/media-controller-fullscreen-ltr.html [ Skip ]
</span><ins>+media/modern-media-controls/media-controller/media-controller-fade-controls-when-entering-fullscreen.html [ Skip ]
</ins><span class="cx">
</span><span class="cx"> # These tests are all Mac-specific, we never show the tracks menu on iOS
</span><span class="cx"> media/modern-media-controls/tracks-panel
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/TestExpectations (209227 => 209228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/TestExpectations 2016-12-02 02:07:35 UTC (rev 209227)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2016-12-02 02:11:05 UTC (rev 209228)
</span><span class="lines">@@ -1455,6 +1455,7 @@
</span><span class="cx"> [ Yosemite ] media/modern-media-controls/tracks-panel/tracks-panel-select-track-with-keyboard.html [ Skip ]
</span><span class="cx"> [ Yosemite ] media/modern-media-controls/tracks-support/tracks-support-show-and-populate-panel.html [ Skip ]
</span><span class="cx"> [ Yosemite ] media/modern-media-controls/tracks-support/tracks-support-click-track-in-panel.html [ Skip ]
</span><ins>+[ Yosemite ] media/modern-media-controls/media-controller/media-controller-fade-controls-when-entering-fullscreen.html
</ins><span class="cx">
</span><span class="cx"> webkit.org/b/164616 http/tests/media/modern-media-controls/skip-back-support/skip-back-support-button-click.html [ Pass Failure ]
</span><span class="cx"> webkit.org/b/164323 media/modern-media-controls/airplay-support/airplay-support.html [ Pass Failure ]
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (209227 => 209228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-12-02 02:07:35 UTC (rev 209227)
+++ trunk/Source/WebCore/ChangeLog 2016-12-02 02:11:05 UTC (rev 209228)
</span><span class="lines">@@ -1,5 +1,27 @@
</span><span class="cx"> 2016-12-01 Antoine Quint <graouts@apple.com>
</span><span class="cx">
</span><ins>+ [Modern Media Controls] Fade controls in when entering and exiting fullscreen
+ https://bugs.webkit.org/show_bug.cgi?id=165287
+
+ Reviewed by Dean Jackson.
+
+ Fade controls in when we enter and leave fullscreen.
+
+ Test: media/modern-media-controls/media-controller/media-controller-fade-controls-when-entering-fullscreen.html
+
+ * Modules/modern-media-controls/controls/media-controls.css:
+ (.media-controls.fade-in):
+ (@keyframes fade-in):
+ (to):
+ * Modules/modern-media-controls/controls/media-controls.js:
+ (MediaControls.prototype.presentInElement):
+ * Modules/modern-media-controls/media/fullscreen-support.js:
+ (FullscreenSupport.prototype.buttonWasClicked):
+ * Modules/modern-media-controls/media/media-controller.js:
+ (MediaController.prototype._updateControlsIfNeeded):
+
+2016-12-01 Antoine Quint <graouts@apple.com>
+
</ins><span class="cx"> [Modern Media Controls] Show and populate the tracks panel
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=165284
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmodernmediacontrolscontrolsmediacontrolscss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/modern-media-controls/controls/media-controls.css (209227 => 209228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/modern-media-controls/controls/media-controls.css 2016-12-02 02:07:35 UTC (rev 209227)
+++ trunk/Source/WebCore/Modules/modern-media-controls/controls/media-controls.css 2016-12-02 02:11:05 UTC (rev 209228)
</span><span class="lines">@@ -39,3 +39,13 @@
</span><span class="cx"> .media-controls > .controls-bar {
</span><span class="cx"> position: absolute;
</span><span class="cx"> }
</span><ins>+
+.media-controls.fade-in {
+ animation-name: fade-in;
+ animation-duration: 350ms;
+}
+
+@keyframes fade-in {
+ from { opacity: 0 }
+ to { opacity: 1 }
+}
</ins></span></pre></div>
<a id="trunkSourceWebCoreModulesmodernmediacontrolscontrolsmediacontrolsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/modern-media-controls/controls/media-controls.js (209227 => 209228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/modern-media-controls/controls/media-controls.js 2016-12-02 02:07:35 UTC (rev 209227)
+++ trunk/Source/WebCore/Modules/modern-media-controls/controls/media-controls.js 2016-12-02 02:11:05 UTC (rev 209228)
</span><span class="lines">@@ -101,6 +101,13 @@
</span><span class="cx"> this._invalidateChildren();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ presentInElement(parentElement, animated)
+ {
+ if (animated)
+ this.element.classList.add("fade-in");
+ parentElement.appendChild(this.element);
+ }
+
</ins><span class="cx"> // Private
</span><span class="cx">
</span><span class="cx"> _invalidateChildren()
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmodernmediacontrolsmediafullscreensupportjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/modern-media-controls/media/fullscreen-support.js (209227 => 209228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/modern-media-controls/media/fullscreen-support.js 2016-12-02 02:07:35 UTC (rev 209227)
+++ trunk/Source/WebCore/Modules/modern-media-controls/media/fullscreen-support.js 2016-12-02 02:11:05 UTC (rev 209228)
</span><span class="lines">@@ -60,6 +60,8 @@
</span><span class="cx">
</span><span class="cx"> buttonWasClicked(control)
</span><span class="cx"> {
</span><ins>+ this.mediaController.controls.element.remove();
+
</ins><span class="cx"> const media = this.mediaController.media;
</span><span class="cx"> if (media.webkitDisplayingFullscreen)
</span><span class="cx"> media.webkitExitFullscreen();
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmodernmediacontrolsmediamediacontrollerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/modern-media-controls/media/media-controller.js (209227 => 209228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/modern-media-controls/media/media-controller.js 2016-12-02 02:07:35 UTC (rev 209227)
+++ trunk/Source/WebCore/Modules/modern-media-controls/media/media-controller.js 2016-12-02 02:11:05 UTC (rev 209228)
</span><span class="lines">@@ -100,12 +100,11 @@
</span><span class="cx">
</span><span class="cx"> this.controls = new ControlsClass;
</span><span class="cx">
</span><del>- if (previousControls) {
- this.shadowRoot.replaceChild(this.controls.element, previousControls.element);
</del><ins>+ if (previousControls)
</ins><span class="cx"> this.controls.usesLTRUserInterfaceLayoutDirection = previousControls.usesLTRUserInterfaceLayoutDirection;
</span><del>- } else
- this.shadowRoot.appendChild(this.controls.element);
</del><span class="cx">
</span><ins>+ this.controls.presentInElement(this.shadowRoot, !!previousControls);
+
</ins><span class="cx"> this._updateControlsSize();
</span><span class="cx">
</span><span class="cx"> this._supportingObjects = [AirplaySupport, ControlsVisibilitySupport, ElapsedTimeSupport, FullscreenSupport, MuteSupport, PiPSupport, PlacardSupport, PlaybackSupport, RemainingTimeSupport, ScrubbingSupport, SkipBackSupport, StartSupport, StatusSupport, TracksSupport, VolumeSupport].map(SupportClass => {
</span></span></pre>
</div>
</div>
</body>
</html>