<!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>[212872] 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/212872">212872</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2017-02-22 18:55:59 -0800 (Wed, 22 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Modern Media Controls] Clicking on the video doesn't toggle playback state in fullscreen on macOS
https://bugs.webkit.org/show_bug.cgi?id=168755
<rdar://problem/30664484>
Patch by Antoine Quint <graouts@apple.com> on 2017-02-22
Reviewed by Dean Jackson.
Source/WebCore:
We now call super in the handleEvent() method of MacOSFullscreenMediaControls if we're not dealing
with an event type and target combination that was specifically registered in this class's scope.
We had mistakenly added the call to super.handleEvent(event) in the wrong method when fixing
https://bugs.webkit.org/show_bug.cgi?id=168515.
Test: media/modern-media-controls/media-controller/media-controller-click-on-video-background-should-pause-fullscreen.html
* Modules/modern-media-controls/controls/macos-fullscreen-media-controls.js:
(MacOSFullscreenMediaControls.prototype.handleEvent):
(MacOSFullscreenMediaControls.prototype._handleMousedown):
* Modules/modern-media-controls/controls/macos-media-controls.js:
(MacOSMediaControls.prototype.handleEvent):
(MacOSMediaControls):
LayoutTests:
Add a dedicated test for fullscreen to check that clicking on the video correctly toggles playback.
* media/modern-media-controls/media-controller/media-controller-click-on-video-background-should-pause-fullscreen-expected.txt: Added.
* media/modern-media-controls/media-controller/media-controller-click-on-video-background-should-pause-fullscreen.html: Added.
* platform/ios-simulator/TestExpectations:</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="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmodernmediacontrolscontrolsmacosfullscreenmediacontrolsjs">trunk/Source/WebCore/Modules/modern-media-controls/controls/macos-fullscreen-media-controls.js</a></li>
<li><a href="#trunkSourceWebCoreModulesmodernmediacontrolscontrolsmacosmediacontrolsjs">trunk/Source/WebCore/Modules/modern-media-controls/controls/macos-media-controls.js</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolsmediacontrollermediacontrollerclickonvideobackgroundshouldpausefullscreenexpectedtxt">trunk/LayoutTests/media/modern-media-controls/media-controller/media-controller-click-on-video-background-should-pause-fullscreen-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolsmediacontrollermediacontrollerclickonvideobackgroundshouldpausefullscreenhtml">trunk/LayoutTests/media/modern-media-controls/media-controller/media-controller-click-on-video-background-should-pause-fullscreen.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (212871 => 212872)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-02-23 02:52:48 UTC (rev 212871)
+++ trunk/LayoutTests/ChangeLog 2017-02-23 02:55:59 UTC (rev 212872)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2017-02-22 Antoine Quint <graouts@apple.com>
</span><span class="cx">
</span><ins>+ [Modern Media Controls] Clicking on the video doesn't toggle playback state in fullscreen on macOS
+ https://bugs.webkit.org/show_bug.cgi?id=168755
+ <rdar://problem/30664484>
+
+ Reviewed by Dean Jackson.
+
+ Add a dedicated test for fullscreen to check that clicking on the video correctly toggles playback.
+
+ * media/modern-media-controls/media-controller/media-controller-click-on-video-background-should-pause-fullscreen-expected.txt: Added.
+ * media/modern-media-controls/media-controller/media-controller-click-on-video-background-should-pause-fullscreen.html: Added.
+ * platform/ios-simulator/TestExpectations:
+
+2017-02-22 Antoine Quint <graouts@apple.com>
+
</ins><span class="cx"> [Modern Media Controls] Scrubber stops moving while scrubbing on macOS
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=168518
</span><span class="cx"> <rdar://problem/30577637>
</span></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolsmediacontrollermediacontrollerclickonvideobackgroundshouldpausefullscreenexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/modern-media-controls/media-controller/media-controller-click-on-video-background-should-pause-fullscreen-expected.txt (0 => 212872)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/media-controller/media-controller-click-on-video-background-should-pause-fullscreen-expected.txt (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/media-controller/media-controller-click-on-video-background-should-pause-fullscreen-expected.txt 2017-02-23 02:55:59 UTC (rev 212872)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><ins>+Testing that clicking on a fullscreen video's background pauses it.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS mediaControls.querySelector('button.fullscreen') instanceof HTMLButtonElement became true
+
+Entering fullscreen
+PASS media.webkitDisplayingFullscreen is true
+PASS media.paused is false
+
+Clicking on video background
+PASS media.paused is true
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolsmediacontrollermediacontrollerclickonvideobackgroundshouldpausefullscreenhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/modern-media-controls/media-controller/media-controller-click-on-video-background-should-pause-fullscreen.html (0 => 212872)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/media-controller/media-controller-click-on-video-background-should-pause-fullscreen.html (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/media-controller/media-controller-click-on-video-background-should-pause-fullscreen.html 2017-02-23 02:55:59 UTC (rev 212872)
</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>
+<video src="../../content/test.mp4" style="position: absolute; top: 0; left: 0; width: 800px;" controls autoplay></video>
+<script type="text/javascript">
+
+description("Testing that clicking on a fullscreen video's background pauses it.");
+
+window.jsTestIsAsync = true;
+
+const media = document.querySelector("video");
+const mediaControls = window.internals.shadowRoot(media);
+
+media.addEventListener("play", () => {
+ shouldBecomeEqual("mediaControls.querySelector('button.fullscreen') instanceof HTMLButtonElement", "true", () => {
+ debug("");
+ debug("Entering fullscreen");
+ pressOnElement(mediaControls.querySelector("button.fullscreen"));
+ });
+});
+
+
+media.addEventListener("webkitfullscreenchange", () => {
+ shouldBeTrue("media.webkitDisplayingFullscreen");
+ shouldBeFalse("media.paused");
+
+ const bounds = media.getBoundingClientRect();
+ debug("");
+ debug("Clicking on video background");
+ eventSender.mouseMoveTo(bounds.left + 5, bounds.top + 5);
+ eventSender.mouseDown();
+ eventSender.mouseUp();
+
+ shouldBeTrue("media.paused");
+
+ debug("");
+ media.remove();
+ finishJSTest();
+});
+
+</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 (212871 => 212872)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator/TestExpectations 2017-02-23 02:52:48 UTC (rev 212871)
+++ trunk/LayoutTests/platform/ios-simulator/TestExpectations 2017-02-23 02:55:59 UTC (rev 212872)
</span><span class="lines">@@ -2812,6 +2812,7 @@
</span><span class="cx"> media/modern-media-controls/media-documents/click-on-video-should-not-pause.html [ Skip ]
</span><span class="cx"> media/modern-media-controls/media-documents/click-on-video-should-not-pause.html [ Skip ]
</span><span class="cx"> media/modern-media-controls/media-controller/media-controller-click-on-video-background-should-pause.html [ Skip ]
</span><ins>+media/modern-media-controls/media-controller/media-controller-click-on-video-background-should-pause-fullscreen.html [ Skip ]
</ins><span class="cx"> media/modern-media-controls/media-controller/media-controller-click-on-video-background-to-dismiss-tracks-panel-should-not-toggle-playback.html [ Skip ]
</span><span class="cx"> media/modern-media-controls/media-controller/media-controller-click-on-video-controls-should-not-pause.html [ Skip ]
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (212871 => 212872)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-02-23 02:52:48 UTC (rev 212871)
+++ trunk/Source/WebCore/ChangeLog 2017-02-23 02:55:59 UTC (rev 212872)
</span><span class="lines">@@ -1,5 +1,27 @@
</span><span class="cx"> 2017-02-22 Antoine Quint <graouts@apple.com>
</span><span class="cx">
</span><ins>+ [Modern Media Controls] Clicking on the video doesn't toggle playback state in fullscreen on macOS
+ https://bugs.webkit.org/show_bug.cgi?id=168755
+ <rdar://problem/30664484>
+
+ Reviewed by Dean Jackson.
+
+ We now call super in the handleEvent() method of MacOSFullscreenMediaControls if we're not dealing
+ with an event type and target combination that was specifically registered in this class's scope.
+ We had mistakenly added the call to super.handleEvent(event) in the wrong method when fixing
+ https://bugs.webkit.org/show_bug.cgi?id=168515.
+
+ Test: media/modern-media-controls/media-controller/media-controller-click-on-video-background-should-pause-fullscreen.html
+
+ * Modules/modern-media-controls/controls/macos-fullscreen-media-controls.js:
+ (MacOSFullscreenMediaControls.prototype.handleEvent):
+ (MacOSFullscreenMediaControls.prototype._handleMousedown):
+ * Modules/modern-media-controls/controls/macos-media-controls.js:
+ (MacOSMediaControls.prototype.handleEvent):
+ (MacOSMediaControls):
+
+2017-02-22 Antoine Quint <graouts@apple.com>
+
</ins><span class="cx"> [Modern Media Controls] Scrubber stops moving while scrubbing on macOS
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=168518
</span><span class="cx"> <rdar://problem/30577637>
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmodernmediacontrolscontrolsmacosfullscreenmediacontrolsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/modern-media-controls/controls/macos-fullscreen-media-controls.js (212871 => 212872)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/modern-media-controls/controls/macos-fullscreen-media-controls.js 2017-02-23 02:52:48 UTC (rev 212871)
+++ trunk/Source/WebCore/Modules/modern-media-controls/controls/macos-fullscreen-media-controls.js 2017-02-23 02:55:59 UTC (rev 212872)
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx">
</span><span class="cx"> this.controlsBar.children = [new BackgroundTint, this._leftContainer, this._centerContainer, this._rightContainer, this.timeControl];
</span><span class="cx">
</span><del>- this.element.addEventListener("mousedown", this);
</del><ins>+ this.controlsBar.element.addEventListener("mousedown", this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Public
</span><span class="lines">@@ -91,17 +91,14 @@
</span><span class="cx">
</span><span class="cx"> handleEvent(event)
</span><span class="cx"> {
</span><del>- switch (event.type) {
- case "mousedown":
</del><ins>+ if (event.type === "mousedown" && event.currentTarget === this.controlsBar.element)
</ins><span class="cx"> this._handleMousedown(event);
</span><del>- break;
- case "mousemove":
</del><ins>+ else if (event.type === "mousemove" && event.currentTarget === this.element)
</ins><span class="cx"> this._handleMousemove(event);
</span><del>- break;
- case "mouseup":
</del><ins>+ else if (event.type === "mouseup" && event.currentTarget === this.element)
</ins><span class="cx"> this._handleMouseup(event);
</span><del>- break;
- }
</del><ins>+ else
+ super.handleEvent(event);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> layout()
</span><span class="lines">@@ -128,12 +125,8 @@
</span><span class="cx">
</span><span class="cx"> _handleMousedown(event)
</span><span class="cx"> {
</span><del>- super.handleEvent(event);
-
- if (event.target !== this.controlsBar.element)
- return;
-
</del><span class="cx"> event.preventDefault();
</span><ins>+ event.stopPropagation();
</ins><span class="cx">
</span><span class="cx"> this._lastDragPoint = this._pointForEvent(event);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmodernmediacontrolscontrolsmacosmediacontrolsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/modern-media-controls/controls/macos-media-controls.js (212871 => 212872)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/modern-media-controls/controls/macos-media-controls.js 2017-02-23 02:52:48 UTC (rev 212871)
+++ trunk/Source/WebCore/Modules/modern-media-controls/controls/macos-media-controls.js 2017-02-23 02:55:59 UTC (rev 212872)
</span><span class="lines">@@ -68,8 +68,9 @@
</span><span class="cx">
</span><span class="cx"> // Only notify that the background was clicked when the "mousedown" event
</span><span class="cx"> // was also received, which wouldn't happen if the "mousedown" event caused
</span><del>- // the tracks panel to be hidden.
- if (event.type === "mousedown")
</del><ins>+ // the tracks panel to be hidden, unless we're in fullscreen in which case
+ // we can simply check that the panel is not currently presented.
+ if (event.type === "mousedown" && !this.tracksPanel.presented)
</ins><span class="cx"> this._receivedMousedown = true;
</span><span class="cx"> else if (event.type === "click") {
</span><span class="cx"> if (this._receivedMousedown && event.target === this.element && this.delegate && typeof this.delegate.macOSControlsBackgroundWasClicked === "function")
</span></span></pre>
</div>
</div>
</body>
</html>