| Index: third_party/WebKit/Source/modules/media_controls/elements/MediaControlElementsHelper.cpp
|
| diff --git a/third_party/WebKit/Source/modules/media_controls/elements/MediaControlElementsHelper.cpp b/third_party/WebKit/Source/modules/media_controls/elements/MediaControlElementsHelper.cpp
|
| index 0734977ad76573ce802bb42cb2b978b492752beb..554ed41da98a14dcef0c5b603006bc57ae89e372 100644
|
| --- a/third_party/WebKit/Source/modules/media_controls/elements/MediaControlElementsHelper.cpp
|
| +++ b/third_party/WebKit/Source/modules/media_controls/elements/MediaControlElementsHelper.cpp
|
| @@ -5,6 +5,7 @@
|
| #include "modules/media_controls/elements/MediaControlElementsHelper.h"
|
|
|
| #include "core/events/Event.h"
|
| +#include "core/layout/api/LayoutSliderItem.h"
|
|
|
| namespace blink {
|
|
|
| @@ -16,4 +17,33 @@ bool MediaControlElementsHelper::IsUserInteractionEvent(Event* event) {
|
| event->IsKeyboardEvent() || event->IsTouchEvent();
|
| }
|
|
|
| +// static
|
| +bool MediaControlElementsHelper::IsUserInteractionEventForSlider(
|
| + Event* event,
|
| + LayoutObject* layout_object) {
|
| + // It is unclear if this can be converted to isUserInteractionEvent(), since
|
| + // mouse* events seem to be eaten during a drag anyway, see
|
| + // https://crbug.com/516416.
|
| + if (IsUserInteractionEvent(event))
|
| + return true;
|
| +
|
| + // Some events are only captured during a slider drag.
|
| + const LayoutSliderItem& slider =
|
| + LayoutSliderItem(ToLayoutSlider(layout_object));
|
| + // TODO(crbug.com/695459#c1): LayoutSliderItem::inDragMode is incorrectly
|
| + // false for drags that start from the track instead of the thumb.
|
| + // Use SliderThumbElement::m_inDragMode and
|
| + // SliderContainerElement::m_touchStarted instead.
|
| + if (!slider.IsNull() && !slider.InDragMode())
|
| + 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;
|
| +}
|
| +
|
| } // namespace blink
|
|
|