New media playback UI.

Source/core/html/shadow/MediaControlElements.cpp

 /*
  * Copyright (C) 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 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.
@@ skipping 47 matching lines @@
     const AtomicString& type = event->type();
     return type == EventTypeNames::mousedown
         || type == EventTypeNames::mouseup
         || type == EventTypeNames::click
         || type == EventTypeNames::dblclick
         || event->isKeyboardEvent()
         || event->isTouchEvent();
 }
 
 // Sliders (the volume control and timeline) need to capture some additional events used when dragging the thumb.
-static bool isUserInteractionEventForSlider(Event* event)
+static bool isUserInteractionEventForSlider(Event* event, LayoutObject* layoutObject)
 {
+    // It is unclear if this can be converted to isUserInteractionEvent(), since
+    // mouse* events seem to be eaten during a drag anyway.  crbug.com/516416 .
+    if (isUserInteractionEvent(event))
+        return true;
+
+    // Some events are only captured during a slider drag.
+    LayoutSlider* slider = toLayoutSlider(layoutObject);
+    if (slider && !slider->inDragMode())
+        return false;
+
     const AtomicString& type = event->type();
-    return type == EventTypeNames::mousedown
-        || type == EventTypeNames::mouseup
-        || type == EventTypeNames::click
-        || type == EventTypeNames::dblclick
-        || type == EventTypeNames::mouseover
+    return type == EventTypeNames::mouseover
         || type == EventTypeNames::mouseout
-        || type == EventTypeNames::mousemove
-        || event->isKeyboardEvent()
-        || event->isTouchEvent();
+        || type == EventTypeNames::mousemove;
 }
 
 
 MediaControlPanelElement::MediaControlPanelElement(MediaControls& mediaControls)
     : MediaControlDivElement(mediaControls, MediaControlsPanel)
     , m_isDisplayed(false)
     , m_opaque(true)
     , m_transitionTimer(this, &MediaControlPanelElement::transitionTimerFired)
 {
 }
@@ skipping 29 matching lines @@
 
 void MediaControlPanelElement::stopTimer()
 {
     if (m_transitionTimer.isActive())
         m_transitionTimer.stop();
 }
 
 void MediaControlPanelElement::transitionTimerFired(Timer<MediaControlPanelElement>*)
 {
     if (!m_opaque)
-        hide();
+        setIsWanted(false);
 
     stopTimer();
 }
 
 void MediaControlPanelElement::didBecomeVisible()
 {
     ASSERT(m_isDisplayed && m_opaque);
     mediaElement().mediaControlsDidBecomeVisible();
 }
 
 void MediaControlPanelElement::makeOpaque()
 {
     if (m_opaque)
         return;
 
     setInlineStyleProperty(CSSPropertyOpacity, 1.0, CSSPrimitiveValue::UnitType::Number);
     m_opaque = true;
 
     if (m_isDisplayed) {
-        show();
+        setIsWanted(true);
         didBecomeVisible();
     }
 }
 
 void MediaControlPanelElement::makeTransparent()
 {
     if (!m_opaque)
         return;
 
     setInlineStyleProperty(CSSPropertyOpacity, 0.0, CSSPrimitiveValue::UnitType::Number);
@@ skipping 141 matching lines @@
 {
     if (event->type() == EventTypeNames::click && mediaElement().togglePlayStateWillPlay()) {
         mediaElement().togglePlayState();
         updateDisplayType();
         event->setDefaultHandled();
     }
 }
 
 void MediaControlOverlayPlayButtonElement::updateDisplayType()
 {
-    if (mediaElement().shouldShowControls() && mediaElement().togglePlayStateWillPlay())
-        show();
-    else
-        hide();
+    setIsWanted(mediaElement().shouldShowControls() && mediaElement().togglePlayStateWillPlay());
 }
 
 bool MediaControlOverlayPlayButtonElement::keepEventInNode(Event* event)
 {
     return isUserInteractionEvent(event);
 }
 
 
 // ----------------------------
 
 MediaControlToggleClosedCaptionsButtonElement::MediaControlToggleClosedCaptionsButtonElement(MediaControls& mediaControls)
     : MediaControlInputElement(mediaControls, MediaShowClosedCaptionsButton)
 {
 }
 
 PassRefPtrWillBeRawPtr<MediaControlToggleClosedCaptionsButtonElement> MediaControlToggleClosedCaptionsButtonElement::create(MediaControls& mediaControls)
 {
     RefPtrWillBeRawPtr<MediaControlToggleClosedCaptionsButtonElement> button = adoptRefWillBeNoop(new MediaControlToggleClosedCaptionsButtonElement(mediaControls));
     button->ensureUserAgentShadowRoot();
     button->setType(InputTypeNames::button);
     button->setShadowPseudoId(AtomicString("-webkit-media-controls-toggle-closed-captions-button", AtomicString::ConstructFromLiteral));
-    button->hide();
+    button->setIsWanted(false);
     return button.release();
 }
 
 void MediaControlToggleClosedCaptionsButtonElement::updateDisplayType()
 {
     bool captionsVisible = mediaElement().closedCaptionsVisible();
     setDisplayType(captionsVisible ? MediaHideClosedCaptionsButton : MediaShowClosedCaptionsButton);
     setChecked(captionsVisible);
 }
 
@@ skipping 78 matching lines @@
 void MediaControlTimelineElement::setDuration(double duration)
 {
     setFloatingPointAttribute(maxAttr, std::isfinite(duration) ? duration : 0);
 
     if (LayoutObject* layoutObject = this->layoutObject())
         layoutObject->setShouldDoFullPaintInvalidation();
 }
 
 bool MediaControlTimelineElement::keepEventInNode(Event* event)
 {
-    return isUserInteractionEventForSlider(event);
+    return isUserInteractionEventForSlider(event, layoutObject());
 }
 
 // ----------------------------
 
 MediaControlVolumeSliderElement::MediaControlVolumeSliderElement(MediaControls& mediaControls)
     : MediaControlInputElement(mediaControls, MediaVolumeSlider)
 {
 }
 
 PassRefPtrWillBeRawPtr<MediaControlVolumeSliderElement> MediaControlVolumeSliderElement::create(MediaControls& mediaControls)
@@ skipping 42 matching lines @@
 }
 
 void MediaControlVolumeSliderElement::setVolume(double volume)
 {
     if (value().toDouble() != volume)
         setValue(String::number(volume));
 }
 
 bool MediaControlVolumeSliderElement::keepEventInNode(Event* event)
 {
-    return isUserInteractionEventForSlider(event);
+    return isUserInteractionEventForSlider(event, layoutObject());
 }
 
 // ----------------------------
 
 MediaControlFullscreenButtonElement::MediaControlFullscreenButtonElement(MediaControls& mediaControls)
     : MediaControlInputElement(mediaControls, MediaEnterFullscreenButton)
 {
 }
 
 PassRefPtrWillBeRawPtr<MediaControlFullscreenButtonElement> MediaControlFullscreenButtonElement::create(MediaControls& mediaControls)
 {
     RefPtrWillBeRawPtr<MediaControlFullscreenButtonElement> button = adoptRefWillBeNoop(new MediaControlFullscreenButtonElement(mediaControls));
     button->ensureUserAgentShadowRoot();
     button->setType(InputTypeNames::button);
     button->setShadowPseudoId(AtomicString("-webkit-media-controls-fullscreen-button", AtomicString::ConstructFromLiteral));
-    button->hide();
+    button->setIsWanted(false);
     return button.release();
 }
 
 void MediaControlFullscreenButtonElement::defaultEventHandler(Event* event)
 {
     if (event->type() == EventTypeNames::click) {
         if (mediaElement().isFullscreen())
             mediaElement().exitFullscreen();
         else
             mediaElement().enterFullscreen();
@@ skipping 86 matching lines @@
 }
 
 PassRefPtrWillBeRawPtr<MediaControlCurrentTimeDisplayElement> MediaControlCurrentTimeDisplayElement::create(MediaControls& mediaControls)
 {
     RefPtrWillBeRawPtr<MediaControlCurrentTimeDisplayElement> element = adoptRefWillBeNoop(new MediaControlCurrentTimeDisplayElement(mediaControls));
     element->setShadowPseudoId(AtomicString("-webkit-media-controls-current-time-display", AtomicString::ConstructFromLiteral));
     return element.release();
 }
 
 } // namespace blink