<!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>[211961] 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/211961">211961</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2017-02-09 09:13:12 -0800 (Thu, 09 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Modern Media Controls] Tapping the skip back button on iOS inline media controls make the controls disappear
https://bugs.webkit.org/show_bug.cgi?id=168049
<rdar://problem/30442660>
Patch by Antoine Quint <graouts@apple.com> on 2017-02-09
Reviewed by Eric Carlson.
Source/WebCore:
Calling elementAtPoint() on the Document will not return an element in the ShadowRoot,
we need to call it on the ShadowRoot. So we now iterate over ancestors of the controls
bar to find the ShadowRoot, if any, and check whether the tapped element is contained
within the controls bar. We only fade the controls bar out if the tapped element is
outside of the controls bar hierarchy.
Test: media/modern-media-controls/media-controller/media-controller-ios-do-not-hide-controls-when-tapping-button.html
* Modules/modern-media-controls/controls/controls-bar.js:
(ControlsBar.prototype.gestureRecognizerStateDidChange):
LayoutTests:
Add a new iOS-specific test that checks that tapping a button does not automatically dismisses the controls bar.
* media/modern-media-controls/media-controller/media-controller-ios-do-not-hide-controls-when-tapping-button-expected.txt: Added.
* media/modern-media-controls/media-controller/media-controller-ios-do-not-hide-controls-when-tapping-button.html: Added.
* platform/mac/TestExpectations:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</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="#trunkSourceWebCoreModulesmodernmediacontrolscontrolscontrolsbarjs">trunk/Source/WebCore/Modules/modern-media-controls/controls/controls-bar.js</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolsmediacontrollermediacontrolleriosdonothidecontrolswhentappingbuttonexpectedtxt">trunk/LayoutTests/media/modern-media-controls/media-controller/media-controller-ios-do-not-hide-controls-when-tapping-button-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolsmediacontrollermediacontrolleriosdonothidecontrolswhentappingbuttonhtml">trunk/LayoutTests/media/modern-media-controls/media-controller/media-controller-ios-do-not-hide-controls-when-tapping-button.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (211960 => 211961)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-02-09 16:37:17 UTC (rev 211960)
+++ trunk/LayoutTests/ChangeLog 2017-02-09 17:13:12 UTC (rev 211961)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2017-02-09 Antoine Quint <graouts@apple.com>
+
+ [Modern Media Controls] Tapping the skip back button on iOS inline media controls make the controls disappear
+ https://bugs.webkit.org/show_bug.cgi?id=168049
+ <rdar://problem/30442660>
+
+ Reviewed by Eric Carlson.
+
+ Add a new iOS-specific test that checks that tapping a button does not automatically dismisses the controls bar.
+
+ * media/modern-media-controls/media-controller/media-controller-ios-do-not-hide-controls-when-tapping-button-expected.txt: Added.
+ * media/modern-media-controls/media-controller/media-controller-ios-do-not-hide-controls-when-tapping-button.html: Added.
+ * platform/mac/TestExpectations:
+
</ins><span class="cx"> 2017-02-09 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed GTK+ gardening. Skip tests that require UIScriptController::zoomToScale.
</span></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolsmediacontrollermediacontrolleriosdonothidecontrolswhentappingbuttonexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/modern-media-controls/media-controller/media-controller-ios-do-not-hide-controls-when-tapping-button-expected.txt (0 => 211961)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/media-controller/media-controller-ios-do-not-hide-controls-when-tapping-button-expected.txt (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/media-controller/media-controller-ios-do-not-hide-controls-when-tapping-button-expected.txt 2017-02-09 17:13:12 UTC (rev 211961)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+Testing that tapping on the skip back button while playing on iOS does not fade the controls.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS window.internals.shadowRoot(media).querySelector('.controls-bar').classList.contains('faded') is false
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolsmediacontrollermediacontrolleriosdonothidecontrolswhentappingbuttonhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/modern-media-controls/media-controller/media-controller-ios-do-not-hide-controls-when-tapping-button.html (0 => 211961)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/media-controller/media-controller-ios-do-not-hide-controls-when-tapping-button.html (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/media-controller/media-controller-ios-do-not-hide-controls-when-tapping-button.html 2017-02-09 17:13:12 UTC (rev 211961)
</span><span class="lines">@@ -0,0 +1,25 @@
</span><ins>+<script src="../../../resources/js-test-pre.js"></script>
+<script src="../resources/media-controls-utils.js" type="text/javascript"></script>
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<body>
+<video src="../../content/test.mp4" style="width: 300px; position: absolute; left: 0; top: 0;" type="video/mp4" playsinline muted autoplay controls></video>
+<script type="text/javascript">
+
+window.jsTestIsAsync = true;
+
+description("Testing that tapping on the skip back button while playing on iOS does not fade the controls.");
+
+const media = document.querySelector("video");
+
+media.addEventListener("play", event => {
+ pressOnElement(window.internals.shadowRoot(media).querySelector("button.skip-back"), () => {
+ window.requestAnimationFrame(() => {
+ shouldBeFalse("window.internals.shadowRoot(media).querySelector('.controls-bar').classList.contains('faded')");
+ finishJSTest();
+ });
+ });
+});
+
+</script>
+<script src="../../../resources/js-test-post.js"></script>
+</body>
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/TestExpectations (211960 => 211961)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/TestExpectations 2017-02-09 16:37:17 UTC (rev 211960)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2017-02-09 17:13:12 UTC (rev 211961)
</span><span class="lines">@@ -1469,6 +1469,7 @@
</span><span class="cx"> media/modern-media-controls/scrubber-support/ipad/scrubber-support-drag.html [ Skip ]
</span><span class="cx"> media/modern-media-controls/ios-inline-media-controls/ios-inline-media-controls-audio-background.html [ Skip ]
</span><span class="cx"> media/modern-media-controls/media-controller/media-controller-ios-only-enable-tap-gesture-recognizer-with-fades-when-idle.html [ Skip ]
</span><ins>+media/modern-media-controls/media-controller/media-controller-ios-do-not-hide-controls-when-tapping-button.html [ Skip ]
</ins><span class="cx">
</span><span class="cx"> # This one always times out on the bots, cannot reproduce locally.
</span><span class="cx"> webkit.org/b/165234 media/modern-media-controls/audio/audio-controls-buttons.html [ Skip ]
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (211960 => 211961)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-02-09 16:37:17 UTC (rev 211960)
+++ trunk/Source/WebCore/ChangeLog 2017-02-09 17:13:12 UTC (rev 211961)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2017-02-09 Antoine Quint <graouts@apple.com>
+
+ [Modern Media Controls] Tapping the skip back button on iOS inline media controls make the controls disappear
+ https://bugs.webkit.org/show_bug.cgi?id=168049
+ <rdar://problem/30442660>
+
+ Reviewed by Eric Carlson.
+
+ Calling elementAtPoint() on the Document will not return an element in the ShadowRoot,
+ we need to call it on the ShadowRoot. So we now iterate over ancestors of the controls
+ bar to find the ShadowRoot, if any, and check whether the tapped element is contained
+ within the controls bar. We only fade the controls bar out if the tapped element is
+ outside of the controls bar hierarchy.
+
+ Test: media/modern-media-controls/media-controller/media-controller-ios-do-not-hide-controls-when-tapping-button.html
+
+ * Modules/modern-media-controls/controls/controls-bar.js:
+ (ControlsBar.prototype.gestureRecognizerStateDidChange):
+
</ins><span class="cx"> 2017-02-09 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> Configure MockRealtimeAudioSourceMac to generate stereo audio
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmodernmediacontrolscontrolscontrolsbarjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/modern-media-controls/controls/controls-bar.js (211960 => 211961)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/modern-media-controls/controls/controls-bar.js 2017-02-09 16:37:17 UTC (rev 211960)
+++ trunk/Source/WebCore/Modules/modern-media-controls/controls/controls-bar.js 2017-02-09 17:13:12 UTC (rev 211961)
</span><span class="lines">@@ -176,8 +176,16 @@
</span><span class="cx"> if (this.faded)
</span><span class="cx"> this.faded = false;
</span><span class="cx"> else {
</span><ins>+ let ancestor = this.element.parentNode;
+ while (ancestor && !(ancestor instanceof ShadowRoot))
+ ancestor = ancestor.parentNode;
+
+ const shadowRoot = ancestor;
+ if (!shadowRoot)
+ return;
+
</ins><span class="cx"> const tapLocation = recognizer.locationInClient();
</span><del>- const tappedElement = document.elementFromPoint(tapLocation.x, tapLocation.y);
</del><ins>+ const tappedElement = shadowRoot.elementFromPoint(tapLocation.x, tapLocation.y);
</ins><span class="cx"> if (!this.element.contains(tappedElement))
</span><span class="cx"> this.faded = true;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>