<!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>[212861] 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/212861">212861</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2017-02-22 16:19:04 -0800 (Wed, 22 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Modern Media Controls] Can't set the volume slider with macOS inline controls
https://bugs.webkit.org/show_bug.cgi?id=168747
<rdar://problem/30605528>
Patch by Antoine Quint <graouts@apple.com> on 2017-02-22
Reviewed by Dean Jackson.
Source/WebCore:
Only call super for events we haven't registered specifically in the context
of this class. Otherwise we'd invalidate the volume container visibility for
a "mousedown" event registered by the MacOSMediaControls, the super class.
* Modules/modern-media-controls/controls/macos-inline-media-controls.js:
(MacOSInlineMediaControls.prototype.handleEvent):
LayoutTests:
Add some assertions to check that the volume slider container remains visible
after interacting with the volume slider.
* media/modern-media-controls/volume-support/volume-support-click-expected.txt:
* media/modern-media-controls/volume-support/volume-support-click.html:
* media/modern-media-controls/volume-support/volume-support-drag-expected.txt:
* media/modern-media-controls/volume-support/volume-support-drag.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolsvolumesupportvolumesupportclickexpectedtxt">trunk/LayoutTests/media/modern-media-controls/volume-support/volume-support-click-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolsvolumesupportvolumesupportclickhtml">trunk/LayoutTests/media/modern-media-controls/volume-support/volume-support-click.html</a></li>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolsvolumesupportvolumesupportdragexpectedtxt">trunk/LayoutTests/media/modern-media-controls/volume-support/volume-support-drag-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolsvolumesupportvolumesupportdraghtml">trunk/LayoutTests/media/modern-media-controls/volume-support/volume-support-drag.html</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (212860 => 212861)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-02-22 23:55:34 UTC (rev 212860)
+++ trunk/LayoutTests/ChangeLog 2017-02-23 00:19:04 UTC (rev 212861)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2017-02-22 Antoine Quint <graouts@apple.com>
+
+ [Modern Media Controls] Can't set the volume slider with macOS inline controls
+ https://bugs.webkit.org/show_bug.cgi?id=168747
+ <rdar://problem/30605528>
+
+ Reviewed by Dean Jackson.
+
+ Add some assertions to check that the volume slider container remains visible
+ after interacting with the volume slider.
+
+ * media/modern-media-controls/volume-support/volume-support-click-expected.txt:
+ * media/modern-media-controls/volume-support/volume-support-click.html:
+ * media/modern-media-controls/volume-support/volume-support-drag-expected.txt:
+ * media/modern-media-controls/volume-support/volume-support-drag.html:
+
</ins><span class="cx"> 2017-02-22 Youenn Fablet <youenn@apple.com>
</span><span class="cx">
</span><span class="cx"> [WebRTC] Some webrtc tests are failing
</span></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolsvolumesupportvolumesupportclickexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/modern-media-controls/volume-support/volume-support-click-expected.txt (212860 => 212861)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/volume-support/volume-support-click-expected.txt 2017-02-22 23:55:34 UTC (rev 212860)
+++ trunk/LayoutTests/media/modern-media-controls/volume-support/volume-support-click-expected.txt 2017-02-23 00:19:04 UTC (rev 212861)
</span><span class="lines">@@ -3,6 +3,7 @@
</span><span class="cx"> On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
</span><span class="cx">
</span><span class="cx">
</span><ins>+PASS mediaController.controls.volumeSlider.parent.visible is true
</ins><span class="cx"> PASS media.volume is 0.5
</span><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolsvolumesupportvolumesupportclickhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/modern-media-controls/volume-support/volume-support-click.html (212860 => 212861)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/volume-support/volume-support-click.html 2017-02-22 23:55:34 UTC (rev 212860)
+++ trunk/LayoutTests/media/modern-media-controls/volume-support/volume-support-click.html 2017-02-23 00:19:04 UTC (rev 212861)
</span><span class="lines">@@ -47,6 +47,9 @@
</span><span class="cx"> eventSender.mouseDown();
</span><span class="cx"> eventSender.mouseUp();
</span><span class="cx">
</span><ins>+ // Ensure the volume slider remains visible.
+ shouldBeTrue("mediaController.controls.volumeSlider.parent.visible");
+
</ins><span class="cx"> scheduler.frameDidFire = null;
</span><span class="cx"> }
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolsvolumesupportvolumesupportdragexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/modern-media-controls/volume-support/volume-support-drag-expected.txt (212860 => 212861)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/volume-support/volume-support-drag-expected.txt 2017-02-22 23:55:34 UTC (rev 212860)
+++ trunk/LayoutTests/media/modern-media-controls/volume-support/volume-support-drag-expected.txt 2017-02-23 00:19:04 UTC (rev 212861)
</span><span class="lines">@@ -15,6 +15,7 @@
</span><span class="cx">
</span><span class="cx"> We finished dragging to set the volume to 1
</span><span class="cx"> PASS media.volume is 1
</span><ins>+PASS mediaController.controls.volumeSlider.parent.visible is true
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolsvolumesupportvolumesupportdraghtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/modern-media-controls/volume-support/volume-support-drag.html (212860 => 212861)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/volume-support/volume-support-drag.html 2017-02-22 23:55:34 UTC (rev 212860)
+++ trunk/LayoutTests/media/modern-media-controls/volume-support/volume-support-drag.html 2017-02-23 00:19:04 UTC (rev 212861)
</span><span class="lines">@@ -72,6 +72,10 @@
</span><span class="cx"> debug("");
</span><span class="cx"> debug("We finished dragging to set the volume to 1");
</span><span class="cx"> shouldBe("media.volume", "1");
</span><ins>+
+ // Ensure the volume slider remains visible.
+ shouldBeTrue("mediaController.controls.volumeSlider.parent.visible");
+
</ins><span class="cx"> container.remove();
</span><span class="cx"> media.remove();
</span><span class="cx"> finishMediaControlsTest();
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (212860 => 212861)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-02-22 23:55:34 UTC (rev 212860)
+++ trunk/Source/WebCore/ChangeLog 2017-02-23 00:19:04 UTC (rev 212861)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2017-02-22 Antoine Quint <graouts@apple.com>
+
+ [Modern Media Controls] Can't set the volume slider with macOS inline controls
+ https://bugs.webkit.org/show_bug.cgi?id=168747
+ <rdar://problem/30605528>
+
+ Reviewed by Dean Jackson.
+
+ Only call super for events we haven't registered specifically in the context
+ of this class. Otherwise we'd invalidate the volume container visibility for
+ a "mousedown" event registered by the MacOSMediaControls, the super class.
+
+ * Modules/modern-media-controls/controls/macos-inline-media-controls.js:
+ (MacOSInlineMediaControls.prototype.handleEvent):
+
</ins><span class="cx"> 2017-02-22 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> Replace SimpleLineLayout::Range by WTF::IteratorRange
</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 (212860 => 212861)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/modern-media-controls/controls/macos-inline-media-controls.js 2017-02-22 23:55:34 UTC (rev 212860)
+++ trunk/Source/WebCore/Modules/modern-media-controls/controls/macos-inline-media-controls.js 2017-02-23 00:19:04 UTC (rev 212861)
</span><span class="lines">@@ -141,8 +141,12 @@
</span><span class="cx">
</span><span class="cx"> handleEvent(event)
</span><span class="cx"> {
</span><del>- super.handleEvent(event);
- this._volumeSliderContainer.visible = event.type === "mouseenter" || event.relatedTarget === this._volumeSliderContainer.element;
</del><ins>+ if (event.type === "mouseenter" && event.currentTarget === this.muteButton.element)
+ this._volumeSliderContainer.visible = true;
+ else if (event.type === "mouseleave" && (event.currentTarget === this.muteButton.element || event.currentTarget === this._volumeSliderContainer.element))
+ this._volumeSliderContainer.visible = this._volumeSliderContainer.element.contains(event.relatedTarget);
+ else
+ super.handleEvent(event);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> controlsBarVisibilityDidChange(controlsBar)
</span></span></pre>
</div>
</div>
</body>
</html>