Changeset 183971 in webkit

Timestamp:

May 7, 2015, 6:55:08 PM (11 years ago)

Author:

dino@apple.com

Message:

[iOS] MediaControls: disappear while scrubbing
​https://bugs.webkit.org/show_bug.cgi?id=144777
<rdar://problem/20065572>

Reviewed by Eric Carlson.

If we are scrubbing we shouldn't hide the controls.

• Modules/mediacontrols/mediaControlsApple.js:

(Controller.prototype.hideControls): Return early if we are scrubbing.

• Modules/mediacontrols/mediaControlsiOS.js:

(ControllerIOS.prototype): Add initial value for _potentiallyScrubbing and
rename from non-underscored value throughout the file.
(ControllerIOS.prototype.handleTimelineTouchEnd): When we finish scrubbing, reset
the timer to hide the controls.

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-05-07  Dean Jackson  <dino@apple.com>
+
+        [iOS] MediaControls: disappear while scrubbing
+        https://bugs.webkit.org/show_bug.cgi?id=144777
+        <rdar://problem/20065572>
+
+        Reviewed by Eric Carlson.
+
+        If we are scrubbing we shouldn't hide the controls.
+
+        * Modules/mediacontrols/mediaControlsApple.js:
+        (Controller.prototype.hideControls): Return early if we are scrubbing.
+        * Modules/mediacontrols/mediaControlsiOS.js:
+        (ControllerIOS.prototype): Add initial value for _potentiallyScrubbing and
+        rename from non-underscored value throughout the file.
+        (ControllerIOS.prototype.handleTimelineTouchEnd): When we finish scrubbing, reset
+        the timer to hide the controls.
+
 2015-05-07  Simon Fraser  <simon.fraser@apple.com>
 

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

@@ -1363 +1363 @@
     hideControls: function()
     {
-        if (this.controlsAlwaysVisible())
+        if (this.controlsAlwaysVisible() || this._potentiallyScrubbing)
             return;
 

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

@@ -17 +17 @@
     this._timelineIsHidden = false;
     this._currentDisplayWidth = 0;
+    this._potentiallyScrubbing = false;
     this.scheduleUpdateLayoutForDisplayedWidth();
 
@@ -494 +495 @@
 
     handleTimelineInput: function(event) {
-        if (this.potentiallyScrubbing)
+        if (this._potentiallyScrubbing)
             this.video.pause();
         Controller.prototype.handleTimelineInput.call(this, event);
@@ -505 +506 @@
 
     handleTimelineTouchStart: function(event) {
-        this.potentiallyScrubbing = true;
+        this._potentiallyScrubbing = true;
         this.wasPlayingWhenScrubbingStarted = !this.video.paused;
         this.listenFor(this.controls.timeline, 'touchend', this.handleTimelineTouchEnd);
@@ -514 +515 @@
         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._potentiallyScrubbing = false;
+        if (this.wasPlayingWhenScrubbingStarted && this.video.paused) {
             this.video.play();
+            this.resetHideControlsTimer();
+        }
     },