Title: [213996] trunk
- Revision
- 213996
- Author
- commit-qu...@webkit.org
- Date
- 2017-03-15 11:51:49 -0700 (Wed, 15 Mar 2017)
Log Message
[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 <grao...@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.
Modified Paths
Added Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (213995 => 213996)
--- trunk/LayoutTests/ChangeLog 2017-03-15 18:26:19 UTC (rev 213995)
+++ trunk/LayoutTests/ChangeLog 2017-03-15 18:51:49 UTC (rev 213996)
@@ -1,3 +1,16 @@
+2017-03-15 Antoine Quint <grao...@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.
+
2017-03-15 Jonathan Bedard <jbed...@apple.com>
Remove TestExpectations.orig after r213882
Added: trunk/LayoutTests/media/modern-media-controls/tracks-panel/tracks-panel-prevent-default-on-keydown-expected.txt (0 => 213996)
--- 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)
@@ -0,0 +1,16 @@
+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
+
Added: trunk/LayoutTests/media/modern-media-controls/tracks-panel/tracks-panel-prevent-default-on-keydown.html (0 => 213996)
--- 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)
@@ -0,0 +1,40 @@
+<script src=""
+<script src="" 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=""
+</body>
Modified: trunk/Source/WebCore/ChangeLog (213995 => 213996)
--- 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)
@@ -1,5 +1,20 @@
2017-03-15 Antoine Quint <grao...@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.
+
+ 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 <grao...@apple.com>
+
[Modern Media Controls] Tracks menu overlaps controls bar in fullscreen
https://bugs.webkit.org/show_bug.cgi?id=169670
<rdar://problem/31060086>
Modified: trunk/Source/WebCore/Modules/modern-media-controls/controls/tracks-panel.js (213995 => 213996)
--- 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)
@@ -225,7 +225,13 @@
case "Escape":
this._dismiss();
break;
+ default:
+ return;
}
+
+ // 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();
}
_dismiss()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
