<!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>[213632] 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/213632">213632</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2017-03-08 23:45:11 -0800 (Wed, 08 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Modern Media Controls] iOS: Live Broadcast video shows scrubber with 00:00 duration until paused
https://bugs.webkit.org/show_bug.cgi?id=169374
<rdar://problem/30063273>
Patch by Antoine Quint <graouts@apple.com> on 2017-03-08
Reviewed by Dean Jackson.
Source/WebCore:
We need to make sure we update the controls layout when they come back from being hidden, so promote
that functionality from MacOSInlineMediaControls to MediaControls so that iOS can pick that behavior
up.
Test: media/modern-media-controls/ios-inline-media-controls/ios-inline-media-controls-status-label-enabled-hidden-controls-bar.html
* Modules/modern-media-controls/controls/macos-inline-media-controls.js:
(MacOSInlineMediaControls.prototype.controlsBarVisibilityDidChange): Deleted.
* Modules/modern-media-controls/controls/media-controls.js:
(MediaControls.prototype.controlsBarVisibilityDidChange):
LayoutTests:
Add a test that checks that we correctly show the status label after enabling it with the controls bar
invisible.
* media/modern-media-controls/ios-inline-media-controls/ios-inline-media-controls-status-label-enabled-hidden-controls-bar-expected.txt: Added.
* media/modern-media-controls/ios-inline-media-controls/ios-inline-media-controls-status-label-enabled-hidden-controls-bar.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmodernmediacontrolscontrolsmacosinlinemediacontrolsjs">trunk/Source/WebCore/Modules/modern-media-controls/controls/macos-inline-media-controls.js</a></li>
<li><a href="#trunkSourceWebCoreModulesmodernmediacontrolscontrolsmediacontrolsjs">trunk/Source/WebCore/Modules/modern-media-controls/controls/media-controls.js</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolsiosinlinemediacontrolsiosinlinemediacontrolsstatuslabelenabledhiddencontrolsbarexpectedtxt">trunk/LayoutTests/media/modern-media-controls/ios-inline-media-controls/ios-inline-media-controls-status-label-enabled-hidden-controls-bar-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolsiosinlinemediacontrolsiosinlinemediacontrolsstatuslabelenabledhiddencontrolsbarhtml">trunk/LayoutTests/media/modern-media-controls/ios-inline-media-controls/ios-inline-media-controls-status-label-enabled-hidden-controls-bar.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (213631 => 213632)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-03-09 06:31:55 UTC (rev 213631)
+++ trunk/LayoutTests/ChangeLog 2017-03-09 07:45:11 UTC (rev 213632)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2017-03-08 Antoine Quint <graouts@apple.com>
+
+ [Modern Media Controls] iOS: Live Broadcast video shows scrubber with 00:00 duration until paused
+ https://bugs.webkit.org/show_bug.cgi?id=169374
+ <rdar://problem/30063273>
+
+ Reviewed by Dean Jackson.
+
+ Add a test that checks that we correctly show the status label after enabling it with the controls bar
+ invisible.
+
+ * media/modern-media-controls/ios-inline-media-controls/ios-inline-media-controls-status-label-enabled-hidden-controls-bar-expected.txt: Added.
+ * media/modern-media-controls/ios-inline-media-controls/ios-inline-media-controls-status-label-enabled-hidden-controls-bar.html: Added.
+
</ins><span class="cx"> 2017-03-08 Jiewen Tan <jiewen_tan@apple.com>
</span><span class="cx">
</span><span class="cx"> [WebCrypto] Implement SubtleCrypto::DeriveKey method
</span></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolsiosinlinemediacontrolsiosinlinemediacontrolsstatuslabelenabledhiddencontrolsbarexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/modern-media-controls/ios-inline-media-controls/ios-inline-media-controls-status-label-enabled-hidden-controls-bar-expected.txt (0 => 213632)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/ios-inline-media-controls/ios-inline-media-controls-status-label-enabled-hidden-controls-bar-expected.txt (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/ios-inline-media-controls/ios-inline-media-controls-status-label-enabled-hidden-controls-bar-expected.txt 2017-03-09 07:45:11 UTC (rev 213632)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+Testing IOSInlineMediaControls statusLabel.enabled while the controls bar is hidden
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Making the controls bar invisible
+PASS mediaControls.statusLabel.parent is null
+
+Setting statusLabel.enabled = true
+
+Making the controls bar visible again
+PASS mediaControls.statusLabel.parent is mediaControls.controlsBar
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolsiosinlinemediacontrolsiosinlinemediacontrolsstatuslabelenabledhiddencontrolsbarhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/modern-media-controls/ios-inline-media-controls/ios-inline-media-controls-status-label-enabled-hidden-controls-bar.html (0 => 213632)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/ios-inline-media-controls/ios-inline-media-controls-status-label-enabled-hidden-controls-bar.html (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/ios-inline-media-controls/ios-inline-media-controls-status-label-enabled-hidden-controls-bar.html 2017-03-09 07:45:11 UTC (rev 213632)
</span><span class="lines">@@ -0,0 +1,44 @@
</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>
+<script type="text/javascript">
+
+description("Testing <code>IOSInlineMediaControls</code> statusLabel.enabled while the controls bar is hidden");
+
+window.jsTestIsAsync = true;
+
+const mediaControls = new IOSInlineMediaControls({ width: 600 });
+
+let numberOfFrames = 0;
+scheduler.frameDidFire = function()
+{
+ numberOfFrames++;
+
+ switch (numberOfFrames) {
+ case 1:
+ mediaControls.controlsBar.visible = false;
+ debug("Making the controls bar invisible");
+ shouldBeNull("mediaControls.statusLabel.parent");
+ break;
+ case 2:
+ debug("");
+ debug("Setting statusLabel.enabled = true");
+ mediaControls.statusLabel.enabled = true;
+ break;
+ case 3:
+ mediaControls.controlsBar.visible = true;
+ debug("");
+ debug("Making the controls bar visible again");
+ shouldBe("mediaControls.statusLabel.parent", "mediaControls.controlsBar");
+
+ debug("");
+ finishMediaControlsTest();
+ break;
+ }
+
+};
+
+</script>
+<script src="../../../resources/js-test-post.js"></script>
+</body>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (213631 => 213632)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-03-09 06:31:55 UTC (rev 213631)
+++ trunk/Source/WebCore/ChangeLog 2017-03-09 07:45:11 UTC (rev 213632)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2017-03-08 Antoine Quint <graouts@apple.com>
+
+ [Modern Media Controls] iOS: Live Broadcast video shows scrubber with 00:00 duration until paused
+ https://bugs.webkit.org/show_bug.cgi?id=169374
+ <rdar://problem/30063273>
+
+ Reviewed by Dean Jackson.
+
+ We need to make sure we update the controls layout when they come back from being hidden, so promote
+ that functionality from MacOSInlineMediaControls to MediaControls so that iOS can pick that behavior
+ up.
+
+ Test: media/modern-media-controls/ios-inline-media-controls/ios-inline-media-controls-status-label-enabled-hidden-controls-bar.html
+
+ * Modules/modern-media-controls/controls/macos-inline-media-controls.js:
+ (MacOSInlineMediaControls.prototype.controlsBarVisibilityDidChange): Deleted.
+ * Modules/modern-media-controls/controls/media-controls.js:
+ (MediaControls.prototype.controlsBarVisibilityDidChange):
+
</ins><span class="cx"> 2017-03-08 Jiewen Tan <jiewen_tan@apple.com>
</span><span class="cx">
</span><span class="cx"> [WebCrypto] Implement SubtleCrypto::DeriveKey method
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmodernmediacontrolscontrolsmacosinlinemediacontrolsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/modern-media-controls/controls/macos-inline-media-controls.js (213631 => 213632)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/modern-media-controls/controls/macos-inline-media-controls.js 2017-03-09 06:31:55 UTC (rev 213631)
+++ trunk/Source/WebCore/Modules/modern-media-controls/controls/macos-inline-media-controls.js 2017-03-09 07:45:11 UTC (rev 213632)
</span><span class="lines">@@ -91,12 +91,6 @@
</span><span class="cx"> super.handleEvent(event);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- controlsBarVisibilityDidChange(controlsBar)
- {
- if (controlsBar.visible)
- this.layout();
- }
-
</del><span class="cx"> layoutTraitsDidChange()
</span><span class="cx"> {
</span><span class="cx"> if (!this.leftContainer || !this.rightContainer)
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmodernmediacontrolscontrolsmediacontrolsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/modern-media-controls/controls/media-controls.js (213631 => 213632)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/modern-media-controls/controls/media-controls.js 2017-03-09 06:31:55 UTC (rev 213631)
+++ trunk/Source/WebCore/Modules/modern-media-controls/controls/media-controls.js 2017-03-09 07:45:11 UTC (rev 213632)
</span><span class="lines">@@ -167,7 +167,8 @@
</span><span class="cx">
</span><span class="cx"> controlsBarVisibilityDidChange(controlsBar)
</span><span class="cx"> {
</span><del>- // Implemented by subclasses as needed.
</del><ins>+ if (controlsBar.visible)
+ this.layout();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> layoutTraitsDidChange()
</span></span></pre>
</div>
</div>
</body>
</html>