<!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>[209592] 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/209592">209592</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-12-08 18:37:45 -0800 (Thu, 08 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Modern Media Controls] Exiting fullscreen with paused media shows the start button
https://bugs.webkit.org/show_bug.cgi?id=165640
Patch by Antoine Quint <graouts@apple.com> on 2016-12-08
Reviewed by Dean Jackson.
Source/WebCore:
Like all supporting objects, the StartSupport instance gets recreated when creating controls
for new layout traits, which happens when going from fullscreen to inline. Due to this, the
"_isPlayed" property is not longer set to true, even if the media has played prior to being
paused in fullscreen. We now also check the media's played range to identify whether media
has been played.
* Modules/modern-media-controls/media/start-support.js:
(StartSupport.prototype._shouldShowStartButton):
(StartSupport):
LayoutTests:
Modify the existing test that enters fullscreen and returns to inline controls with paused media
to check that the start button is not shown upon returning to inline controls.
* media/modern-media-controls/media-controller/media-controller-inline-to-fullscreen-to-inline-expected.txt:
* media/modern-media-controls/media-controller/media-controller-inline-to-fullscreen-to-inline.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolsmediacontrollermediacontrollerinlinetofullscreentoinlineexpectedtxt">trunk/LayoutTests/media/modern-media-controls/media-controller/media-controller-inline-to-fullscreen-to-inline-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolsmediacontrollermediacontrollerinlinetofullscreentoinlinehtml">trunk/LayoutTests/media/modern-media-controls/media-controller/media-controller-inline-to-fullscreen-to-inline.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmodernmediacontrolsmediastartsupportjs">trunk/Source/WebCore/Modules/modern-media-controls/media/start-support.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (209591 => 209592)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-12-09 02:06:04 UTC (rev 209591)
+++ trunk/LayoutTests/ChangeLog 2016-12-09 02:37:45 UTC (rev 209592)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-12-08 Antoine Quint <graouts@apple.com>
+
+ [Modern Media Controls] Exiting fullscreen with paused media shows the start button
+ https://bugs.webkit.org/show_bug.cgi?id=165640
+
+ Reviewed by Dean Jackson.
+
+ Modify the existing test that enters fullscreen and returns to inline controls with paused media
+ to check that the start button is not shown upon returning to inline controls.
+
+ * media/modern-media-controls/media-controller/media-controller-inline-to-fullscreen-to-inline-expected.txt:
+ * media/modern-media-controls/media-controller/media-controller-inline-to-fullscreen-to-inline.html:
+
</ins><span class="cx"> 2016-12-08 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> ASSERTION FAILED: locale in WebCore::lastHyphenLocation
</span></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolsmediacontrollermediacontrollerinlinetofullscreentoinlineexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/modern-media-controls/media-controller/media-controller-inline-to-fullscreen-to-inline-expected.txt (209591 => 209592)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/media-controller/media-controller-inline-to-fullscreen-to-inline-expected.txt 2016-12-09 02:06:04 UTC (rev 209591)
+++ trunk/LayoutTests/media/modern-media-controls/media-controller/media-controller-inline-to-fullscreen-to-inline-expected.txt 2016-12-09 02:37:45 UTC (rev 209592)
</span><span class="lines">@@ -14,6 +14,7 @@
</span><span class="cx">
</span><span class="cx"> Media exited fullscreen.
</span><span class="cx"> PASS shadowRoot.querySelector('.media-controls').classList.contains('inline') is true
</span><ins>+PASS shadowRoot.querySelector('.start-button') is null
</ins><span class="cx">
</span><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolsmediacontrollermediacontrollerinlinetofullscreentoinlinehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/modern-media-controls/media-controller/media-controller-inline-to-fullscreen-to-inline.html (209591 => 209592)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/media-controller/media-controller-inline-to-fullscreen-to-inline.html 2016-12-09 02:06:04 UTC (rev 209591)
+++ trunk/LayoutTests/media/modern-media-controls/media-controller/media-controller-inline-to-fullscreen-to-inline.html 2016-12-09 02:37:45 UTC (rev 209592)
</span><span class="lines">@@ -37,6 +37,7 @@
</span><span class="cx"> debug("Media exited fullscreen.");
</span><span class="cx"> window.requestAnimationFrame(() => {
</span><span class="cx"> shouldBeTrue("shadowRoot.querySelector('.media-controls').classList.contains('inline')");
</span><ins>+ shouldBeNull("shadowRoot.querySelector('.start-button')");
</ins><span class="cx">
</span><span class="cx"> debug("");
</span><span class="cx"> media.remove();
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (209591 => 209592)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-12-09 02:06:04 UTC (rev 209591)
+++ trunk/Source/WebCore/ChangeLog 2016-12-09 02:37:45 UTC (rev 209592)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-12-08 Antoine Quint <graouts@apple.com>
+
+ [Modern Media Controls] Exiting fullscreen with paused media shows the start button
+ https://bugs.webkit.org/show_bug.cgi?id=165640
+
+ Reviewed by Dean Jackson.
+
+ Like all supporting objects, the StartSupport instance gets recreated when creating controls
+ for new layout traits, which happens when going from fullscreen to inline. Due to this, the
+ "_isPlayed" property is not longer set to true, even if the media has played prior to being
+ paused in fullscreen. We now also check the media's played range to identify whether media
+ has been played.
+
+ * Modules/modern-media-controls/media/start-support.js:
+ (StartSupport.prototype._shouldShowStartButton):
+ (StartSupport):
+
</ins><span class="cx"> 2016-12-08 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> ASSERTION FAILED: locale in WebCore::lastHyphenLocation
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmodernmediacontrolsmediastartsupportjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/modern-media-controls/media/start-support.js (209591 => 209592)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/modern-media-controls/media/start-support.js 2016-12-09 02:06:04 UTC (rev 209591)
+++ trunk/Source/WebCore/Modules/modern-media-controls/media/start-support.js 2016-12-09 02:37:45 UTC (rev 209592)
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> {
</span><span class="cx"> const media = this.mediaController.media;
</span><span class="cx">
</span><del>- if (this._hasPlayed)
</del><ins>+ if (this._hasPlayed || media.played.length)
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if (!media.paused)
</span></span></pre>
</div>
</div>
</body>
</html>