summaryrefslogtreecommitdiff
path: root/chromium/third_party/WebKit/Source/modules/media_controls/elements
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/third_party/WebKit/Source/modules/media_controls/elements')
-rw-r--r--chromium/third_party/WebKit/Source/modules/media_controls/elements/MediaControlTimelineElement.cpp3
-rw-r--r--chromium/third_party/WebKit/Source/modules/media_controls/elements/MediaControlTimelineElement.h3
2 files changed, 4 insertions, 2 deletions
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;