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

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

 /*
  * Copyright (C) 2011, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2011, 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 733 matching lines @@
   }
 
   if (event->type() == EventTypeNames::mousemove) {
     // When we get a mouse move, show the media controls, and start a timer
     // that will hide the media controls after a 3 seconds without a mouse move.
     makeOpaque();
     if (shouldHideMediaControls(IgnoreVideoHover))
       startHideMediaControlsTimer();
     return;
   }
+
+  // If the user is interacting with the controls via the keyboard, don't hide
+  // the controls. This will fire when the user tabs between controls (focusin)
+  // or when they seek either the timeline or volume sliders (input).
+  if (event->type() == EventTypeNames::focusin ||
+      event->type() == EventTypeNames::input)
+    resetHideMediaControlsTimer();
 }
 
 void MediaControls::hideMediaControlsTimerFired(TimerBase*) {
   unsigned behaviorFlags =
       m_hideTimerBehaviorFlags | IgnoreFocus | IgnoreVideoHover;
   m_hideTimerBehaviorFlags = IgnoreNone;
   m_keepShowingUntilTimerFires = false;
 
   if (mediaElement().paused())
     return;
@@ skipping 123 matching lines @@
   stopHideMediaControlsTimer();
   startHideMediaControlsTimer();
 }
 
 void MediaControls::onExitedFullscreen() {
   m_fullscreenButton->setIsFullscreen(false);
   stopHideMediaControlsTimer();
   startHideMediaControlsTimer();
 }
 
+void MediaControls::onPanelKeypress() {
+  // If the user is interacting with the controls via the keyboard, don't hide
+  // the controls. This is called when the user mutes/unmutes, turns CC on/off,
+  // etc.
+  resetHideMediaControlsTimer();

[johnme, 2017/03/30 17:21:41]

It seems that `resetHideMediaControlsTimer` will set
`m_keepShowingUntilTimerFires` to false if it is currently true. Perhaps setting
`m_keepShowingUntilTimerFires` to true should be moved from
`defaultEventHandler` to `startHideMediaControlsTimer`? That code is a little
opaque :-|

[steimel, 2017/04/05 23:38:21]

Discussed offline with mlamouri@. It will be looked at in a separate CL

+}
+
 void MediaControls::notifyElementSizeChanged(ClientRect* newSize) {
   // Note that this code permits a bad frame on resize, since it is
   // run after the relayout / paint happens.  It would be great to improve
   // this, but it would be even greater to move this code entirely to
   // JS and fix it there.
 
   IntSize oldSize = m_size;
   m_size.setWidth(newSize->width());
   m_size.setHeight(newSize->height());
 
@@ skipping 193 matching lines @@
   visitor->trace(m_overflowList);
   visitor->trace(m_castButton);
   visitor->trace(m_overlayCastButton);
   visitor->trace(m_mediaEventListener);
   visitor->trace(m_windowEventListener);
   visitor->trace(m_orientationLockDelegate);
   HTMLDivElement::trace(visitor);
 }
 
 }  // namespace blink