Fix the mouse handling for the video control

bug:5137664
Change-Id: I0f2b1a84beebe03d4282e728bb26ec70d05bf813

diff --git a/Source/WebCore/html/HTMLMediaElement.cpp b/Source/WebCore/html/HTMLMediaElement.cpp
index 93bd09e..f4f7002 100644 (file)
--- a/Source/WebCore/html/HTMLMediaElement.cpp
+++ b/Source/WebCore/html/HTMLMediaElement.cpp
@@ -1634,13 +1634,12 @@ void HTMLMediaElement::playbackProgressTimerFired(Timer<HTMLMediaElement>*)
 
     scheduleTimeupdateEvent(true);
     if (hasMediaControls()) {
-
-        if (!m_mouseOver && controls() && hasVideo()) {
 #if PLATFORM(ANDROID)
-            if (WTF::currentTime() - m_lastTouch > TOUCH_DELAY)
+        m_mouseOver = WTF::currentTime() - m_lastTouch <= TOUCH_DELAY;
 #endif
+        if (!m_mouseOver && controls() && hasVideo())
             mediaControls()->makeTransparent();
-        }
+
         mediaControls()->playbackProgressed();
     }
     // FIXME: deal with cue ranges here
@@ -2374,6 +2373,9 @@ void HTMLMediaElement::defaultEventHandler(Event* event)
         widget->handleEvent(event);
 #else
     if (event->isMouseEvent()) {
+#if PLATFORM(ANDROID)
+        m_lastTouch = WTF::currentTime();
+#endif
         MouseEvent* mouseEvent = static_cast<MouseEvent*>(event);
         if (mouseEvent->relatedTarget() != this) {
             if (event->type() == eventNames().mouseoverEvent) {