Merge 91337 - [chromium] Media player controls do not fade out.

Source/WebCore/html/shadow/MediaControlRootElementChromium.cpp

 /*
  * Copyright (C) 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2011 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 12 matching lines @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 
 #if ENABLE(VIDEO)
 #include "MediaControlRootElementChromium.h"
 
 #include "MediaControlElements.h"
+#include "MouseEvent.h"
 #include "Page.h"
 #include "RenderTheme.h"
 
 using namespace std;
 
 namespace WebCore {
 
 MediaControlRootElementChromium::MediaControlRootElementChromium(HTMLMediaElement* mediaElement)
     : MediaControls(mediaElement)
     , m_mediaElement(mediaElement)
     , m_playButton(0)
     , m_currentTimeDisplay(0)
     , m_timeline(0)
     , m_timelineContainer(0)
     , m_panelMuteButton(0)
     , m_volumeSlider(0)
     , m_volumeSliderContainer(0)
     , m_panel(0)
     , m_opaque(true)
+    , m_isMouseOverControls(false)
 {
 }
 
 PassRefPtr<MediaControls> MediaControls::create(HTMLMediaElement* mediaElement)
 {
     return MediaControlRootElementChromium::create(mediaElement);
 }
 
 PassRefPtr<MediaControlRootElementChromium> MediaControlRootElementChromium::create(HTMLMediaElement* mediaElement)
 {
@@ skipping 140 matching lines @@
 {
     m_playButton->updateDisplayType();
     m_timeline->setPosition(m_mediaElement->currentTime());
     updateTimeDisplay();
 }
 
 void MediaControlRootElementChromium::playbackProgressed()
 {
     m_timeline->setPosition(m_mediaElement->currentTime());
     updateTimeDisplay();
+
+    if (!m_isMouseOverControls && m_mediaElement->hasVideo())
+        makeTransparent();
 }
 
 void MediaControlRootElementChromium::playbackStopped()
 {
     m_playButton->updateDisplayType();
     m_timeline->setPosition(m_mediaElement->currentTime());
     updateTimeDisplay();
     makeOpaque();
 }
 
@@ skipping 30 matching lines @@
 bool MediaControlRootElementChromium::shouldHideControls()
 {
     return !m_panel->hovered();
 }
 
 void MediaControlRootElementChromium::loadedMetadata()
 {
     reset();
 }
 
+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()
 {
 }
 
 void MediaControlRootElementChromium::changedMute()
 {
     m_panelMuteButton->changedMute();
 }
 
 void MediaControlRootElementChromium::changedVolume()
@@ skipping 19 matching lines @@
 
 const AtomicString& MediaControlRootElementChromium::shadowPseudoId() const
 {
     DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls"));
     return id;
 }
 
 }
 
 #endif