Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(808)

Unified Diff: third_party/WebKit/Source/modules/media_controls/MediaControlsImpl.cpp

Issue 2700663002: Adds keyboard functionality for videos. (Closed)
Patch Set: Now calls IsSpatialNavigationEnabled() directly. Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/modules/media_controls/MediaControlsImpl.cpp
diff --git a/third_party/WebKit/Source/modules/media_controls/MediaControlsImpl.cpp b/third_party/WebKit/Source/modules/media_controls/MediaControlsImpl.cpp
index f5a7ef2f3889658e3ad13a113c05acae9f86b954..f571a7629faf4c71ee0aa7fdd7001137b7cc1f4e 100644
--- a/third_party/WebKit/Source/modules/media_controls/MediaControlsImpl.cpp
+++ b/third_party/WebKit/Source/modules/media_controls/MediaControlsImpl.cpp
@@ -36,6 +36,7 @@
#include "core/dom/ResizeObserver.h"
#include "core/dom/ResizeObserverEntry.h"
#include "core/dom/TaskRunnerHelper.h"
+#include "core/events/KeyboardEvent.h"
#include "core/events/MouseEvent.h"
#include "core/frame/Settings.h"
#include "core/frame/UseCounter.h"
@@ -46,6 +47,7 @@
#include "core/html/track/TextTrackList.h"
#include "core/layout/LayoutObject.h"
#include "core/layout/LayoutTheme.h"
+#include "core/page/SpatialNavigation.h"
#include "modules/media_controls/MediaControlsMediaEventListener.h"
#include "modules/media_controls/MediaControlsOrientationLockDelegate.h"
#include "modules/media_controls/MediaControlsRotateToFullscreenDelegate.h"
@@ -849,6 +851,24 @@ void MediaControlsImpl::DefaultEventHandler(Event* event) {
if (event->type() == EventTypeNames::focusin ||
event->type() == EventTypeNames::input)
ResetHideMediaControlsTimer();
+
+ if (event->IsKeyboardEvent() &&
+ !IsSpatialNavigationEnabled(GetDocument().GetFrame())) {
+ const String& key = ToKeyboardEvent(event)->key();
+ if (key == "Enter" || ToKeyboardEvent(event)->keyCode() == ' ') {
+ play_button_->OnMediaKeyboardEvent(event);
+ return;
+ }
+ if (key == "ArrowLeft" || key == "ArrowRight" || key == "Home" ||
+ key == "End") {
+ timeline_->OnMediaKeyboardEvent(event);
+ return;
+ }
+ if (key == "ArrowDown" || key == "ArrowUp") {
+ volume_slider_->OnMediaKeyboardEvent(event);
+ return;
+ }
+ }
}
void MediaControlsImpl::HideMediaControlsTimerFired(TimerBase*) {

Powered by Google App Engine
This is Rietveld 408576698