Changeset 183965 in webkit

Timestamp:

May 7, 2015, 5:45:00 PM (11 years ago)

Author:

dino@apple.com

Message:

[iOS] While scrubbing and holding down, video continues to play
​https://bugs.webkit.org/show_bug.cgi?id=144776
<rdar://problem/20863757>

Reviewed by Simon Fraser.

When we are scrubbing a video, we should pause playback. As we
let go of the scrubber playback can resume (but only if it was
playing originally).

• Modules/mediacontrols/mediaControlsiOS.js:

(ControllerIOS.prototype.createControls): Listen for touchstart on the scrubber.
(ControllerIOS.prototype.handleTimelineInput): Call the prototype, but pause if necessary.
(ControllerIOS.prototype.handleTimelineChange): Just moved this to be with the other timeline functions.
(ControllerIOS.prototype.handleTimelineTouchStart): Add the listeners for end and cancel. Remember that we are
potentially about to scrub.
(ControllerIOS.prototype.handleTimelineTouchEnd): Remove the listeners.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/mediacontrols/mediaControlsiOS.js (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-05-07  Dean Jackson  <dino@apple.com>
+
+        [iOS] While scrubbing and holding down, video continues to play
+        https://bugs.webkit.org/show_bug.cgi?id=144776
+        <rdar://problem/20863757>
+
+        Reviewed by Simon Fraser.
+
+        When we are scrubbing a video, we should pause playback. As we
+        let go of the scrubber playback can resume (but only if it was
+        playing originally).
+
+        * Modules/mediacontrols/mediaControlsiOS.js:
+        (ControllerIOS.prototype.createControls): Listen for touchstart on the scrubber.
+        (ControllerIOS.prototype.handleTimelineInput): Call the prototype, but pause if necessary.
+        (ControllerIOS.prototype.handleTimelineChange): Just moved this to be with the other timeline functions.
+        (ControllerIOS.prototype.handleTimelineTouchStart): Add the listeners for end and cancel. Remember that we are
+        potentially about to scrub.
+        (ControllerIOS.prototype.handleTimelineTouchEnd): Remove the listeners.
+
 2015-05-07  Said Abou-Hallawa  <sabouhallawa@apple.com>
 

trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js

@@ -146 +146 @@
         this.listenFor(this.controls.optimizedFullscreenButton, 'touchend', this.handleOptimizedFullscreenTouchEnd);
         this.listenFor(this.controls.optimizedFullscreenButton, 'touchcancel', this.handleOptimizedFullscreenTouchCancel);
+        this.listenFor(this.controls.timeline, 'touchstart', this.handleTimelineTouchStart);
         this.stopListeningFor(this.controls.playButton, 'click', this.handlePlayButtonClicked);
 
@@ -304 +305 @@
     },
 
-    handleTimelineChange: function(event) {
-        Controller.prototype.handleTimelineChange.call(this);
-        this.updateProgress();
-    },
-
     handlePlayButtonTouchStart: function() {
         this.controls.playButton.classList.add('active');
@@ -495 +491 @@
         this.controls.startPlaybackButton.classList.remove('active');
         return true;
+    },
+
+    handleTimelineInput: function(event) {
+        if (this.potentiallyScrubbing)
+            this.video.pause();
+        Controller.prototype.handleTimelineInput.call(this, event);
+    },
+
+    handleTimelineChange: function(event) {
+        Controller.prototype.handleTimelineChange.call(this, event);
+        this.updateProgress();
+    },
+
+    handleTimelineTouchStart: function(event) {
+        this.potentiallyScrubbing = true;
+        this.wasPlayingWhenScrubbingStarted = !this.video.paused;
+        this.listenFor(this.controls.timeline, 'touchend', this.handleTimelineTouchEnd);
+        this.listenFor(this.controls.timeline, 'touchcancel', this.handleTimelineTouchEnd);
+    },
+
+    handleTimelineTouchEnd: function(event) {
+        this.stopListeningFor(this.controls.timeline, 'touchend', this.handleTimelineTouchEnd);
+        this.stopListeningFor(this.controls.timeline, 'touchcancel', this.handleTimelineTouchEnd);
+        this.potentiallyScrubbing = false;
+        if (this.wasPlayingWhenScrubbingStarted && this.video.paused)
+            this.video.play();
     },