Changeset 91337 in webkit

Timestamp:

Jul 19, 2011 10:52:24 PM (13 years ago)

Author:

sjl@chromium.org

Message:

[chromium] Media player controls do not fade out.
​https://bugs.webkit.org/show_bug.cgi?id=64837

Media controls were not fading out when the mouse leaves the video
due to underlying changes in webkit media controls.
Fix was to copy missing code from MediaControlRootElement to
MediaControlRootElementChromium.

Reviewed by Dimitri Glazkov.

• html/shadow/MediaControlRootElementChromium.cpp:

(WebCore::MediaControlRootElementChromium::MediaControlRootElementChromium):
(WebCore::MediaControlRootElementChromium::playbackProgressed):
(WebCore::MediaControlRootElementChromium::containsRelatedTarget):
(WebCore::MediaControlRootElementChromium::defaultEventHandler):

• html/shadow/MediaControlRootElementChromium.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/shadow/MediaControlRootElementChromium.cpp (modified) (4 diffs)
• html/shadow/MediaControlRootElementChromium.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-07-19  Steve Lacey  <sjl@chromium.org>
+
+        [chromium] Media player controls do not fade out.
+        https://bugs.webkit.org/show_bug.cgi?id=64837
+
+        Media controls were not fading out when the mouse leaves the video
+        due to underlying changes in webkit media controls.
+        Fix was to copy missing code from MediaControlRootElement to
+        MediaControlRootElementChromium.
+
+        Reviewed by Dimitri Glazkov.
+
+        * html/shadow/MediaControlRootElementChromium.cpp:
+        (WebCore::MediaControlRootElementChromium::MediaControlRootElementChromium):
+        (WebCore::MediaControlRootElementChromium::playbackProgressed):
+        (WebCore::MediaControlRootElementChromium::containsRelatedTarget):
+        (WebCore::MediaControlRootElementChromium::defaultEventHandler):
+        * html/shadow/MediaControlRootElementChromium.h:
+
 2011-07-19  Luke Macpherson   <macpherson@chromium.org>
 

trunk/Source/WebCore/html/shadow/MediaControlRootElementChromium.cpp

@@ -31 +31 @@
 
 #include "MediaControlElements.h"
+#include "MouseEvent.h"
 #include "Page.h"
 #include "RenderTheme.h"
@@ -50 +51 @@
     , m_panel(0)
     , m_opaque(true)
+    , m_isMouseOverControls(false)
 {
 }
@@ -210 +212 @@
     m_timeline->setPosition(m_mediaElement->currentTime());
     updateTimeDisplay();
+
+    if (!m_isMouseOverControls && m_mediaElement->hasVideo())
+        makeTransparent();
 }
 
@@ -260 +265 @@
 }
 
+bool MediaControlRootElementChromium::containsRelatedTarget(Event* event)
+{
+    if (!event->isMouseEvent())
+        return false;
+    EventTarget* relatedTarget = static_cast<MouseEvent*>(event)->relatedTarget();
+    if (!relatedTarget)
+        return false;
+    return contains(relatedTarget->toNode());
+}
+
+void MediaControlRootElementChromium::defaultEventHandler(Event* event)
+{
+    MediaControls::defaultEventHandler(event);
+
+    if (event->type() == eventNames().mouseoverEvent) {
+        if (!containsRelatedTarget(event)) {
+            m_isMouseOverControls = true;
+            if (!m_mediaElement->canPlay())
+                makeOpaque();
+        }
+    } else if (event->type() == eventNames().mouseoutEvent) {
+        if (!containsRelatedTarget(event))
+            m_isMouseOverControls = false;
+    }
+}
+
 void MediaControlRootElementChromium::changedClosedCaptionsVisibility()
 {

trunk/Source/WebCore/html/shadow/MediaControlRootElementChromium.h

@@ -90 +90 @@
     MediaControlRootElementChromium(HTMLMediaElement*);
 
+    virtual void defaultEventHandler(Event*);
+
     virtual const AtomicString& shadowPseudoId() const;
+
+    bool containsRelatedTarget(Event*);
 
     HTMLMediaElement* m_mediaElement;
@@ -104 +108 @@
 
     bool m_opaque;
+    bool m_isMouseOverControls;
 };