<!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>[214469] 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/214469">214469</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2017-03-28 00:49:56 -0700 (Tue, 28 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>AX: Media controls should be able to be re-activated after faded away
https://bugs.webkit.org/show_bug.cgi?id=170048
<rdar://problem/30157179>
Patch by Aaron Chu <aaron_chu@apple.com> on 2017-03-28
Reviewed by Antoine Quint.
Source/WebCore:
Added a "foucsin" listener for the controls bar so that when an element
within fires a "focusin" event, the controls bar reappears if it is faded.
Test: media/modern-media-controls/media-controls/media-controls-appear-when-focus.html
* Modules/modern-media-controls/controls/controls-bar.js:
(ControlsBar.prototype.handleEvent):
LayoutTests:
* media/modern-media-controls/media-controls/media-controls-appear-when-focus-expected.txt: Added.
* media/modern-media-controls/media-controls/media-controls-appear-when-focus.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="#trunkSourceWebCoreModulesmodernmediacontrolscontrolscontrolsbarjs">trunk/Source/WebCore/Modules/modern-media-controls/controls/controls-bar.js</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolsmediacontrolsmediacontrolsappearwhenfocusexpectedtxt">trunk/LayoutTests/media/modern-media-controls/media-controls/media-controls-appear-when-focus-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolsmediacontrolsmediacontrolsappearwhenfocushtml">trunk/LayoutTests/media/modern-media-controls/media-controls/media-controls-appear-when-focus.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (214468 => 214469)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2017-03-28 07:34:18 UTC (rev 214468)
+++ trunk/LayoutTests/ChangeLog        2017-03-28 07:49:56 UTC (rev 214469)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2017-03-28 Aaron Chu <aaron_chu@apple.com>
+
+ AX: Media controls should be able to be re-activated after faded away
+ https://bugs.webkit.org/show_bug.cgi?id=170048
+ <rdar://problem/30157179>
+
+ Reviewed by Antoine Quint.
+
+ * media/modern-media-controls/media-controls/media-controls-appear-when-focus-expected.txt: Added.
+ * media/modern-media-controls/media-controls/media-controls-appear-when-focus.html: Added.
+
</ins><span class="cx"> 2017-03-28 Antoine Quint <graouts@apple.com>
</span><span class="cx">
</span><span class="cx"> [Modern Media Controls] Improve media documents across macOS, iPhone and iPad
</span></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolsmediacontrolsmediacontrolsappearwhenfocusexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/modern-media-controls/media-controls/media-controls-appear-when-focus-expected.txt (0 => 214469)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/media-controls/media-controls-appear-when-focus-expected.txt         (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/media-controls/media-controls-appear-when-focus-expected.txt        2017-03-28 07:49:56 UTC (rev 214469)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+Testing the visibility of MediaControls when one of its buttons fires a focus event.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS mediaControls.controlsBar.faded is false
+PASS mediaControls.controlsBar.faded is true
+PASS mediaControls.controlsBar.faded is false
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolsmediacontrolsmediacontrolsappearwhenfocushtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/modern-media-controls/media-controls/media-controls-appear-when-focus.html (0 => 214469)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/media-controls/media-controls-appear-when-focus.html         (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/media-controls/media-controls-appear-when-focus.html        2017-03-28 07:49:56 UTC (rev 214469)
</span><span class="lines">@@ -0,0 +1,21 @@
</span><ins>+<script src="../../../resources/js-test-pre.js"></script>
+<script src="../resources/media-controls-loader.js" type="text/javascript"></script>
+<body>
+<script type="text/javascript">
+
+description("Testing the visibility of <code>MediaControls</code> when one of its buttons fires a focus event.");
+
+const mediaControls = new MediaControls({ layoutTraits: LayoutTraits.macOS });
+
+shouldBeFalse("mediaControls.controlsBar.faded");
+mediaControls.controlsBar.faded = true;
+shouldBeTrue("mediaControls.controlsBar.faded");
+let focusin = new Event("focusin");
+mediaControls.controlsBar.element.dispatchEvent(focusin);
+shouldBeFalse("mediaControls.controlsBar.faded");
+
+debug("");
+
+</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 (214468 => 214469)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2017-03-28 07:34:18 UTC (rev 214468)
+++ trunk/Source/WebCore/ChangeLog        2017-03-28 07:49:56 UTC (rev 214469)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2017-03-28 Aaron Chu <aaron_chu@apple.com>
+
+ AX: Media controls should be able to be re-activated after faded away
+ https://bugs.webkit.org/show_bug.cgi?id=170048
+ <rdar://problem/30157179>
+
+ Reviewed by Antoine Quint.
+
+ Added a "foucsin" listener for the controls bar so that when an element
+ within fires a "focusin" event, the controls bar reappears if it is faded.
+
+ Test: media/modern-media-controls/media-controls/media-controls-appear-when-focus.html
+
+ * Modules/modern-media-controls/controls/controls-bar.js:
+ (ControlsBar.prototype.handleEvent):
+
</ins><span class="cx"> 2017-03-28 Antoine Quint <graouts@apple.com>
</span><span class="cx">
</span><span class="cx"> [Modern Media Controls] Improve media documents across macOS, iPhone and iPad
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmodernmediacontrolscontrolscontrolsbarjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/modern-media-controls/controls/controls-bar.js (214468 => 214469)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/modern-media-controls/controls/controls-bar.js        2017-03-28 07:34:18 UTC (rev 214468)
+++ trunk/Source/WebCore/Modules/modern-media-controls/controls/controls-bar.js        2017-03-28 07:49:56 UTC (rev 214469)
</span><span class="lines">@@ -40,6 +40,8 @@
</span><span class="cx">
</span><span class="cx"> this.fadesWhileIdle = false;
</span><span class="cx"> this.userInteractionEnabled = true;
</span><ins>+
+ this.element.addEventListener("focusin", this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Public
</span><span class="lines">@@ -169,7 +171,7 @@
</span><span class="cx"> } else if (event.type === "mouseleave") {
</span><span class="cx"> delete this._disableAutoHiding;
</span><span class="cx"> this._resetAutoHideTimer(true);
</span><del>- } else if (event.type === "focus")
</del><ins>+ } else if (event.type === "focusin")
</ins><span class="cx"> this.faded = false;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>