Media Controls: Fix time updates when dragging from track not scrubber

third_party/WebKit/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 27 matching lines @@
 #include "core/events/MouseEvent.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/Settings.h"
 #include "core/html/HTMLAnchorElement.h"
 #include "core/html/HTMLLabelElement.h"
 #include "core/html/HTMLMediaSource.h"
 #include "core/html/HTMLSpanElement.h"
 #include "core/html/HTMLVideoElement.h"
 #include "core/html/TimeRanges.h"
 #include "core/html/shadow/MediaControls.h"
+#include "core/html/shadow/ShadowElementNames.h"
+#include "core/html/shadow/SliderThumbElement.h"
 #include "core/html/track/TextTrackList.h"
 #include "core/input/EventHandler.h"
-#include "core/layout/api/LayoutSliderItem.h"
+#include "core/layout/LayoutObject.h"
 #include "core/page/Page.h"
 #include "platform/EventDispatchForbiddenScope.h"
 #include "platform/Histogram.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/text/PlatformLocale.h"
 #include "public/platform/Platform.h"
 #include "public/platform/UserMetricsAction.h"
 
 namespace blink {
 
 using namespace HTMLNames;
 
 namespace {
 
 // This is the duration from mediaControls.css
 const double fadeOutDuration = 0.3;
 
 const QualifiedName& trackIndexAttrName() {
   // Save the track index in an attribute to avoid holding a pointer to the text
   // track.
   DEFINE_STATIC_LOCAL(QualifiedName, trackIndexAttr,
                       (nullAtom, "data-track-index", nullAtom));
   return trackIndexAttr;
 }
 
 // When specified as trackIndex, disable text tracks.
 const int trackIndexOffValue = -1;
 
+bool inDragMode(MediaControlInputElement* rangeInput) {
+  SliderThumbElement* thumb =
+      toSliderThumbElement(rangeInput->userAgentShadowRoot()->getElementById(
+          ShadowElementNames::sliderThumb()));
+  return thumb && thumb->inDragMode();
+}
+
 bool isUserInteractionEvent(Event* event) {
   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.
-bool isUserInteractionEventForSlider(Event* event, LayoutObject* layoutObject) {
+bool isUserInteractionEventForSlider(Event* event,
+                                     MediaControlInputElement* rangeInput) {
   // 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.
-  LayoutSliderItem slider = LayoutSliderItem(toLayoutSlider(layoutObject));
-  if (!slider.isNull() && !slider.inDragMode())
+  if (!inDragMode(rangeInput))
     return false;
 
   const AtomicString& type = event->type();
   return type == EventTypeNames::mouseover ||
          type == EventTypeNames::mouseout ||
          type == EventTypeNames::mousemove ||
          type == EventTypeNames::pointerover ||
          type == EventTypeNames::pointerout ||
          type == EventTypeNames::pointermove;
 }
@@ skipping 669 matching lines @@
   // attribute to be rounded to a value slightly higher than the duration. If
   // this happens and scrubber is dragged near the max, seek to duration.
   if (duration < time && time <= maxAttribute && maxAttribute <= duration + 0.5)
     time = duration;
 
   // FIXME: This will need to take the timeline offset into consideration
   // once that concept is supported, see https://crbug.com/312699
   if (mediaElement().seekable()->contain(time))
     mediaElement().setCurrentTime(time);
 
-  LayoutSliderItem slider = LayoutSliderItem(toLayoutSlider(layoutObject()));
-  if (!slider.isNull() && slider.inDragMode())
+  if (inDragMode(this))
     mediaControls().updateCurrentTimeDisplay();
 }
 
 bool MediaControlTimelineElement::willRespondToMouseClickEvents() {
   return isConnected() && document().isActive();
 }
 
 void MediaControlTimelineElement::setPosition(double currentTime) {
   setValue(String::number(currentTime));
 
   if (LayoutObject* layoutObject = this->layoutObject())
     layoutObject->setShouldDoFullPaintInvalidation();
 }
 
 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, layoutObject());
+  return isUserInteractionEventForSlider(event, this);
 }
 
 // ----------------------------
 
 MediaControlVolumeSliderElement::MediaControlVolumeSliderElement(
     MediaControls& mediaControls)
     : MediaControlInputElement(mediaControls, MediaVolumeSlider) {}
 
 MediaControlVolumeSliderElement* MediaControlVolumeSliderElement::create(
     MediaControls& mediaControls) {
@@ skipping 46 matching lines @@
 void MediaControlVolumeSliderElement::setVolume(double volume) {
   if (value().toDouble() == volume)
     return;
 
   setValue(String::number(volume));
   if (LayoutObject* layoutObject = this->layoutObject())
     layoutObject->setShouldDoFullPaintInvalidation();
 }
 
 bool MediaControlVolumeSliderElement::keepEventInNode(Event* event) {
-  return isUserInteractionEventForSlider(event, layoutObject());
+  return isUserInteractionEventForSlider(event, this);
 }
 
 // ----------------------------
 
 MediaControlFullscreenButtonElement::MediaControlFullscreenButtonElement(
     MediaControls& mediaControls)
     : MediaControlInputElement(mediaControls, MediaEnterFullscreenButton) {}
 
 MediaControlFullscreenButtonElement*
 MediaControlFullscreenButtonElement::create(MediaControls& mediaControls) {
@@ skipping 166 matching lines @@
 MediaControlCurrentTimeDisplayElement*
 MediaControlCurrentTimeDisplayElement::create(MediaControls& mediaControls) {
   MediaControlCurrentTimeDisplayElement* element =
       new MediaControlCurrentTimeDisplayElement(mediaControls);
   element->setShadowPseudoId(
       AtomicString("-webkit-media-controls-current-time-display"));
   return element;
 }
 
 }  // namespace blink