| Index: Source/core/html/shadow/MediaControls.cpp
|
| diff --git a/Source/core/html/shadow/MediaControls.cpp b/Source/core/html/shadow/MediaControls.cpp
|
| index 57d0d7332aa13034da29eba261dceaa173f23285..2f827bd203aee4f1c7007dc251071ed56f3c3b56 100644
|
| --- a/Source/core/html/shadow/MediaControls.cpp
|
| +++ b/Source/core/html/shadow/MediaControls.cpp
|
| @@ -68,7 +68,6 @@ MediaControls::MediaControls(HTMLMediaElement& mediaElement)
|
| , m_hideTimerBehaviorFlags(IgnoreNone)
|
| , m_isMouseOverControls(false)
|
| , m_isPausedForScrubbing(false)
|
| - , m_wasLastEventTouch(false)
|
| {
|
| }
|
|
|
| @@ -439,14 +438,14 @@ void MediaControls::stoppedCasting()
|
| void MediaControls::defaultEventHandler(Event* event)
|
| {
|
| HTMLDivElement::defaultEventHandler(event);
|
| - m_wasLastEventTouch = event->isTouchEvent() || event->isGestureEvent()
|
| - || (event->isMouseEvent() && toMouseEvent(event)->fromTouch());
|
|
|
| // Add IgnoreControlsHover to m_hideTimerBehaviorFlags when we see a touch event,
|
| // to allow the hide-timer to do the right thing when it fires.
|
| // FIXME: Preferably we would only do this when we're actually handling the event
|
| // here ourselves.
|
| - m_hideTimerBehaviorFlags |= m_wasLastEventTouch ? IgnoreControlsHover : IgnoreNone;
|
| + bool wasLastEventTouch = event->isTouchEvent() || event->isGestureEvent()
|
| + || (event->isMouseEvent() && toMouseEvent(event)->fromTouch());
|
| + m_hideTimerBehaviorFlags |= wasLastEventTouch ? IgnoreControlsHover : IgnoreNone;
|
|
|
| if (event->type() == EventTypeNames::mouseover) {
|
| if (!containsRelatedTarget(event)) {
|
|
|