diff options
Diffstat (limited to 'chromium/third_party/WebKit/Source/modules/media_controls')
3 files changed, 5 insertions, 2 deletions
diff --git a/chromium/third_party/WebKit/Source/modules/media_controls/MediaControlsImpl.h b/chromium/third_party/WebKit/Source/modules/media_controls/MediaControlsImpl.h index 177744e8f48..5d22dc12e25 100644 --- a/chromium/third_party/WebKit/Source/modules/media_controls/MediaControlsImpl.h +++ b/chromium/third_party/WebKit/Source/modules/media_controls/MediaControlsImpl.h @@ -144,6 +144,7 @@ class MODULES_EXPORT MediaControlsImpl final : public HTMLDivElement, friend class MediaControlsRotateToFullscreenDelegateTest; friend class MediaControlsImplTest; friend class MediaControlsImplInProductHelpTest; + friend class MediaControlTimelineElementTest; // Need to be members of MediaControls for private member access. class BatchedControlUpdate; diff --git a/chromium/third_party/WebKit/Source/modules/media_controls/elements/MediaControlTimelineElement.cpp b/chromium/third_party/WebKit/Source/modules/media_controls/elements/MediaControlTimelineElement.cpp index 167749245a9..724e052b0ef 100644 --- a/chromium/third_party/WebKit/Source/modules/media_controls/elements/MediaControlTimelineElement.cpp +++ b/chromium/third_party/WebKit/Source/modules/media_controls/elements/MediaControlTimelineElement.cpp @@ -81,7 +81,8 @@ void MediaControlTimelineElement::DefaultEventHandler(Event* event) { bool started_from_thumb = thumb && thumb == event->target()->ToNode(); metrics_.StartGesture(started_from_thumb); } - if (event->type() == EventTypeNames::pointerup) { + if (event->type() == EventTypeNames::pointerup || + event->type() == EventTypeNames::pointercancel) { Platform::Current()->RecordAction( UserMetricsAction("Media.Controls.ScrubbingEnd")); GetMediaControls().EndScrubbing(); diff --git a/chromium/third_party/WebKit/Source/modules/media_controls/elements/MediaControlTimelineElement.h b/chromium/third_party/WebKit/Source/modules/media_controls/elements/MediaControlTimelineElement.h index 3b703baa2ec..2fd98180bd0 100644 --- a/chromium/third_party/WebKit/Source/modules/media_controls/elements/MediaControlTimelineElement.h +++ b/chromium/third_party/WebKit/Source/modules/media_controls/elements/MediaControlTimelineElement.h @@ -5,6 +5,7 @@ #ifndef MediaControlTimelineElement_h #define MediaControlTimelineElement_h +#include "modules/ModulesExport.h" #include "modules/media_controls/elements/MediaControlSliderElement.h" #include "modules/media_controls/elements/MediaControlTimelineMetrics.h" @@ -15,7 +16,7 @@ class MediaControlsImpl; class MediaControlTimelineElement final : public MediaControlSliderElement { public: - explicit MediaControlTimelineElement(MediaControlsImpl&); + MODULES_EXPORT explicit MediaControlTimelineElement(MediaControlsImpl&); // MediaControlInputElement overrides. bool WillRespondToMouseClickEvents() override; |