Ensure media control goes to transparent(hide) after seek by touch

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 16 matching lines @@
 #include "config.h"
 #include "core/html/shadow/MediaControls.h"
 
 #include "bindings/core/v8/ExceptionStatePlaceholder.h"
 #include "core/dom/ClientRect.h"
 #include "core/events/MouseEvent.h"
 #include "core/frame/Settings.h"
 #include "core/html/HTMLMediaElement.h"
 #include "core/html/MediaController.h"
 #include "core/layout/LayoutTheme.h"
+#include "core/page/EventHandler.h"
 
 namespace blink {
 
 // If you change this value, then also update the corresponding value in
 // LayoutTests/media/media-controls.js.
 static const double timeWithoutMouseMovementBeforeHidingMediaControls = 3;
 
 static bool fullscreenIsSupported(const Document& document)
 {
     return !document.settings() || document.settings()->fullscreenSupported();
@@ skipping 14 matching lines @@
     , m_toggleClosedCaptionsButton(nullptr)
     , m_fullScreenButton(nullptr)
     , m_castButton(nullptr)
     , m_overlayCastButton(nullptr)
     , m_durationDisplay(nullptr)
     , m_enclosure(nullptr)
     , m_hideMediaControlsTimer(this, &MediaControls::hideMediaControlsTimerFired)
     , m_isMouseOverControls(false)
     , m_isPausedForScrubbing(false)
     , m_wasLastEventTouch(false)
+    , m_behaviorFlags(0)
 {
 }
 
 PassRefPtrWillBeRawPtr<MediaControls> MediaControls::create(HTMLMediaElement& mediaElement)
 {
     RefPtrWillBeRawPtr<MediaControls> controls = adoptRefWillBeNoop(new MediaControls(mediaElement));
     controls->setShadowPseudoId(AtomicString("-webkit-media-controls", AtomicString::ConstructFromLiteral));
     controls->initializeControls();
     return controls.release();
 }
@@ skipping 353 matching lines @@
     m_castButton->setIsPlayingRemotely(false);
     m_overlayCastButton->setIsPlayingRemotely(false);
 }
 
 void MediaControls::defaultEventHandler(Event* event)
 {
     HTMLDivElement::defaultEventHandler(event);
     m_wasLastEventTouch = event->isTouchEvent() || event->isGestureEvent()
         || (event->isMouseEvent() && toMouseEvent(event)->fromTouch());
 
+    if (m_wasLastEventTouch) {
+        m_behaviorFlags |= IgnoreControlsHover;

[fs, 2015/02/06 10:32:36]

I think I'd prefer if we could factor this slightly differently by passing the
behaviorFlags to startHideMediaControlsTimer and let it set the element state
(preferably rename m_behaviorFlags so that it's more obvious that it's
associated with the timer). State would then be managed by start/stop (so stop
would clear the flags - as would the timer-function.)

+    }
+
     if (event->type() == EventTypeNames::mouseover) {
         if (!containsRelatedTarget(event)) {
             m_isMouseOverControls = true;
             if (!mediaElement().togglePlayStateWillPlay()) {
                 makeOpaque();
                 if (shouldHideMediaControls())
                     startHideMediaControlsTimer();
             }
         }
         return;
@@ skipping 16 matching lines @@
             startHideMediaControlsTimer();
         return;
     }
 }
 
 void MediaControls::hideMediaControlsTimerFired(Timer<MediaControls>*)
 {
     if (mediaElement().togglePlayStateWillPlay())
         return;
 
-    unsigned behaviorFlags = IgnoreFocus | IgnoreVideoHover;
-    if (m_wasLastEventTouch) {
-        behaviorFlags |= IgnoreControlsHover;
-    }
-    if (!shouldHideMediaControls(behaviorFlags))
+    m_behaviorFlags = m_behaviorFlags | IgnoreFocus | IgnoreVideoHover;
+    if (!shouldHideMediaControls(m_behaviorFlags))
         return;
 
     makeTransparent();
     m_overlayCastButton->hide();
+    m_behaviorFlags = 0;
 }
 
 void MediaControls::startHideMediaControlsTimer()
 {
     m_hideMediaControlsTimer.startOneShot(timeWithoutMouseMovementBeforeHidingMediaControls, FROM_HERE);
 }
 
 void MediaControls::stopHideMediaControlsTimer()
 {
     m_hideMediaControlsTimer.stop();
@@ skipping 66 matching lines @@
     visitor->trace(m_toggleClosedCaptionsButton);
     visitor->trace(m_fullScreenButton);
     visitor->trace(m_durationDisplay);
     visitor->trace(m_enclosure);
     visitor->trace(m_castButton);
     visitor->trace(m_overlayCastButton);
     HTMLDivElement::trace(visitor);
 }
 
 }