Prevent Media Controls from hiding when the user is interacting via the keyboard

third_party/WebKit/Source/core/html/shadow/MediaControlsMediaEventListener.cpp

Index: third_party/WebKit/Source/core/html/shadow/MediaControlsMediaEventListener.cpp
diff --git a/third_party/WebKit/Source/core/html/shadow/MediaControlsMediaEventListener.cpp b/third_party/WebKit/Source/core/html/shadow/MediaControlsMediaEventListener.cpp
index 070f17b32971c62841984ede8a0b15d1d8086e8d..85896b20dff09d0778686a5be3cfefd38557e378 100644
--- a/third_party/WebKit/Source/core/html/shadow/MediaControlsMediaEventListener.cpp
+++ b/third_party/WebKit/Source/core/html/shadow/MediaControlsMediaEventListener.cpp
@@ -42,6 +42,12 @@ void MediaControlsMediaEventListener::attach() {
   textTracks->addEventListener(EventTypeNames::addtrack, this, false);
   textTracks->addEventListener(EventTypeNames::change, this, false);
   textTracks->addEventListener(EventTypeNames::removetrack, this, false);
+
+  // Keypress events.
+  if (m_mediaControls->panelElement()) {

[johnme, 2017/04/06 17:15:28]

Nit: it doesn't seem possible for this to be null, since
MediaControlsImpl::create initialises the media controls (which sets m_panel)
immediately after constructing it. Ditto in detach.

[mlamouri (slow - plz ping), 2017/04/07 13:21:21]

Indeed, we always assume it's available. It should probably return a reference
to make this clear though.

[steimel, 2017/04/07 16:47:16]

I was getting segfaults before I added this. Didn't look too much into it, but
this codepath was getting hit twice, first with the panel==null, and then with
the panel!=null.

+    m_mediaControls->panelElement()->addEventListener(EventTypeNames::keypress,
+                                                      this, false);
+  }
 }
 
 void MediaControlsMediaEventListener::detach() {
@@ -54,6 +60,11 @@ void MediaControlsMediaEventListener::detach() {
   textTracks->removeEventListener(EventTypeNames::addtrack, this, false);
   textTracks->removeEventListener(EventTypeNames::change, this, false);
   textTracks->removeEventListener(EventTypeNames::removetrack, this, false);
+
+  if (m_mediaControls->panelElement()) {
+    m_mediaControls->panelElement()->removeEventListener(
+        EventTypeNames::keypress, this, false);
+  }
 }
 
 bool MediaControlsMediaEventListener::operator==(
@@ -122,6 +133,13 @@ void MediaControlsMediaEventListener::handleEvent(
     return;
   }
 
+  // Keypress events.
+  if (event->type() == EventTypeNames::keypress) {
+    if (event->currentTarget() == m_mediaControls->panelElement())
+      m_mediaControls->onPanelKeypress();
+    return;
+  }
+
   NOTREACHED();
 }