<!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>[213996] 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/213996">213996</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2017-03-15 11:51:49 -0700 (Wed, 15 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Modern Media Controls] Using the arrow keys to navigate in the tracks menu also scrolls the page
https://bugs.webkit.org/show_bug.cgi?id=169671
<rdar://problem/31060091>
Patch by Antoine Quint <graouts@apple.com> on 2017-03-15
Reviewed by Eric Carlson.
Source/WebCore:
We need to call preventDefault() when handling a "keydown" event that we recognize.
Test: media/modern-media-controls/tracks-panel/tracks-panel-prevent-default-on-keydown.html
* Modules/modern-media-controls/controls/tracks-panel.js:
(TracksPanel.prototype._handleKeydown):
LayoutTests:
Add a test that checks that preventDefault() is called on "keydown" events that we know to handle.
* media/modern-media-controls/tracks-panel/tracks-panel-prevent-default-on-keydown-expected.txt: Added.
* media/modern-media-controls/tracks-panel/tracks-panel-prevent-default-on-keydown.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="#trunkSourceWebCoreModulesmodernmediacontrolscontrolstrackspaneljs">trunk/Source/WebCore/Modules/modern-media-controls/controls/tracks-panel.js</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolstrackspaneltrackspanelpreventdefaultonkeydownexpectedtxt">trunk/LayoutTests/media/modern-media-controls/tracks-panel/tracks-panel-prevent-default-on-keydown-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolstrackspaneltrackspanelpreventdefaultonkeydownhtml">trunk/LayoutTests/media/modern-media-controls/tracks-panel/tracks-panel-prevent-default-on-keydown.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (213995 => 213996)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2017-03-15 18:26:19 UTC (rev 213995)
+++ trunk/LayoutTests/ChangeLog        2017-03-15 18:51:49 UTC (rev 213996)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2017-03-15 Antoine Quint <graouts@apple.com>
+
+ [Modern Media Controls] Using the arrow keys to navigate in the tracks menu also scrolls the page
+ https://bugs.webkit.org/show_bug.cgi?id=169671
+ <rdar://problem/31060091>
+
+ Reviewed by Eric Carlson.
+
+ Add a test that checks that preventDefault() is called on "keydown" events that we know to handle.
+
+ * media/modern-media-controls/tracks-panel/tracks-panel-prevent-default-on-keydown-expected.txt: Added.
+ * media/modern-media-controls/tracks-panel/tracks-panel-prevent-default-on-keydown.html: Added.
+
</ins><span class="cx"> 2017-03-15 Jonathan Bedard <jbedard@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove TestExpectations.orig after r213882
</span></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolstrackspaneltrackspanelpreventdefaultonkeydownexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/modern-media-controls/tracks-panel/tracks-panel-prevent-default-on-keydown-expected.txt (0 => 213996)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/tracks-panel/tracks-panel-prevent-default-on-keydown-expected.txt         (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/tracks-panel/tracks-panel-prevent-default-on-keydown-expected.txt        2017-03-15 18:51:49 UTC (rev 213996)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+Testing a TracksPanel calls preventDefault() on events it handles.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+mediaControls.showTracksPanel()
+
+Pressing the ArrowDown key
+PASS event.defaultPrevented is true
+Pressing the ArrowRight key
+PASS event.defaultPrevented is false
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolstrackspaneltrackspanelpreventdefaultonkeydownhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/modern-media-controls/tracks-panel/tracks-panel-prevent-default-on-keydown.html (0 => 213996)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/tracks-panel/tracks-panel-prevent-default-on-keydown.html         (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/tracks-panel/tracks-panel-prevent-default-on-keydown.html        2017-03-15 18:51:49 UTC (rev 213996)
</span><span class="lines">@@ -0,0 +1,40 @@
</span><ins>+<script src="../../../resources/js-test-pre.js"></script>
+<script src="../resources/media-controls-loader.js" type="text/javascript"></script>
+<body style="height: 3000px">
+<script type="text/javascript">
+
+window.jsTestIsAsync = true;
+
+description("Testing a <code>TracksPanel</code> calls preventDefault() on events it handles.");
+
+const mediaControls = new MacOSInlineMediaControls({ width: 680, height: 300 });
+document.body.appendChild(mediaControls.element);
+
+debug("mediaControls.showTracksPanel()");
+mediaControls.showTracksPanel();
+
+scheduler.frameDidFire = function()
+{
+ window.requestAnimationFrame(() => {
+ debug("");
+ debug("Pressing the ArrowDown key");
+ eventSender.keyDown("ArrowDown");
+ debug("Pressing the ArrowRight key");
+ eventSender.keyDown("ArrowRight");
+ debug("");
+ mediaControls.element.remove();
+ finishJSTest();
+ });
+ scheduler.frameDidFire = null;
+}
+
+document.body.addEventListener("keydown", event => {
+ if (event.key === "ArrowRight")
+ shouldBeFalse("event.defaultPrevented");
+ else if (event.key === "ArrowDown")
+ shouldBeTrue("event.defaultPrevented");
+});
+
+</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 (213995 => 213996)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2017-03-15 18:26:19 UTC (rev 213995)
+++ trunk/Source/WebCore/ChangeLog        2017-03-15 18:51:49 UTC (rev 213996)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2017-03-15 Antoine Quint <graouts@apple.com>
</span><span class="cx">
</span><ins>+ [Modern Media Controls] Using the arrow keys to navigate in the tracks menu also scrolls the page
+ https://bugs.webkit.org/show_bug.cgi?id=169671
+ <rdar://problem/31060091>
+
+ Reviewed by Eric Carlson.
+
+ We need to call preventDefault() when handling a "keydown" event that we recognize.
+
+ Test: media/modern-media-controls/tracks-panel/tracks-panel-prevent-default-on-keydown.html
+
+ * Modules/modern-media-controls/controls/tracks-panel.js:
+ (TracksPanel.prototype._handleKeydown):
+
+2017-03-15 Antoine Quint <graouts@apple.com>
+
</ins><span class="cx"> [Modern Media Controls] Tracks menu overlaps controls bar in fullscreen
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=169670
</span><span class="cx"> <rdar://problem/31060086>
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmodernmediacontrolscontrolstrackspaneljs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/modern-media-controls/controls/tracks-panel.js (213995 => 213996)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/modern-media-controls/controls/tracks-panel.js        2017-03-15 18:26:19 UTC (rev 213995)
+++ trunk/Source/WebCore/Modules/modern-media-controls/controls/tracks-panel.js        2017-03-15 18:51:49 UTC (rev 213996)
</span><span class="lines">@@ -225,7 +225,13 @@
</span><span class="cx"> case "Escape":
</span><span class="cx"> this._dismiss();
</span><span class="cx"> break;
</span><ins>+ default:
+ return;
</ins><span class="cx"> }
</span><ins>+
+ // Ensure that we don't let the browser react to a key code we handled,
+ // for instance scrolling the page if we handled an arrow key.
+ event.preventDefault();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> _dismiss()
</span></span></pre>
</div>
</div>
</body>
</html>