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 47 matching lines @@
     , m_timeline(nullptr)
     , m_muteButton(nullptr)
     , m_volumeSlider(nullptr)
     , m_toggleClosedCaptionsButton(nullptr)
     , m_fullScreenButton(nullptr)
     , m_castButton(nullptr)
     , m_overlayCastButton(nullptr)
     , m_durationDisplay(nullptr)
     , m_enclosure(nullptr)
     , m_hideMediaControlsTimer(this, &MediaControls::hideMediaControlsTimerFired)
+    , m_hideTimerBehaviorFlags(IgnoreNone)
     , m_isMouseOverControls(false)
     , m_isPausedForScrubbing(false)
-    , m_wasLastEventTouch(false)
 {
 }
 
 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 350 matching lines @@
 
 void MediaControls::stoppedCasting()
 {
     m_castButton->setIsPlayingRemotely(false);
     m_overlayCastButton->setIsPlayingRemotely(false);
 }
 
 void MediaControls::defaultEventHandler(Event* event)
 {
     HTMLDivElement::defaultEventHandler(event);
-    m_wasLastEventTouch = event->isTouchEvent() || event->isGestureEvent()
+    bool wasLastEventTouch = event->isTouchEvent() || event->isGestureEvent()
         || (event->isMouseEvent() && toMouseEvent(event)->fromTouch());
 
+    if (wasLastEventTouch) {
+        startHideMediaControlsTimer(IgnoreControlsHover);

[fs, 2015/02/06 15:20:59]

unsigned hideBehavior = wasLastEventTouch ? IgnoreControlsHover : IgnoreNone;

and then pass that as appropriate to the invocations of
startHideMediaControlsTimer(). If that works... because we're obviously not
checking for the same types of events as below... that could mean that we need
to keep m_wasLastEventTouch.

[william.xie1, 2015/02/06 15:45:10]

Currently we need to invoke startHideMediaControlsTimer here to mark the
IgnoreControlsHover...

[fs, 2015/02/06 16:01:59]

This could end up starting the timer regardless of whether the event was handled
or not (=> the timer was started). Although I don't really like it maybe we need
a new method that accumulates flags ("configures the next hide timer"), even
though I don't particularly like that since it makes the system very hard to
reason about. It sort of matches the current behavior though I guess...

+    }
+
     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;
-    }
+    unsigned behaviorFlags = m_hideTimerBehaviorFlags | IgnoreFocus | IgnoreVideoHover;
     if (!shouldHideMediaControls(behaviorFlags))
         return;
 
     makeTransparent();
     m_overlayCastButton->hide();
 }
 
-void MediaControls::startHideMediaControlsTimer()
+void MediaControls::startHideMediaControlsTimer(unsigned behaviorFlags)
 {
+    m_hideTimerBehaviorFlags |= behaviorFlags;

[fs, 2015/02/06 15:20:59]

This ought to be a simple assignment.

[william.xie1, 2015/02/06 15:45:10]

You know, startHideMediaControlsTimer is also called by
MediaControls::playbackStarted()
if we use simple assignment, the IgnoreControlsHover flag will be overwritten
before hideMediaControlsTimerFired, thus cannot hide the control bar....

[fs, 2015/02/06 16:01:59]

Ah ok. But that means that the stored flags need to be cleared when the timer
fires (otherwise only an intervening stop() of the timer would clear the flags).

     m_hideMediaControlsTimer.startOneShot(timeWithoutMouseMovementBeforeHidingMediaControls, FROM_HERE);
 }
 
 void MediaControls::stopHideMediaControlsTimer()
 {
     m_hideMediaControlsTimer.stop();
+    m_hideTimerBehaviorFlags = IgnoreNone;
 }
 
 void MediaControls::resetHideMediaControlsTimer()
 {
     stopHideMediaControlsTimer();
     if (!mediaElement().paused())
         startHideMediaControlsTimer();
 }
 
 
@@ skipping 56 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);
 }
 
 }