Title: [183971] trunk/Source/WebCore
- Revision
- 183971
- Author
- [email protected]
- Date
- 2015-05-07 18:55:08 -0700 (Thu, 07 May 2015)
Log 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.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (183970 => 183971)
--- trunk/Source/WebCore/ChangeLog 2015-05-08 01:46:59 UTC (rev 183970)
+++ trunk/Source/WebCore/ChangeLog 2015-05-08 01:55:08 UTC (rev 183971)
@@ -1,3 +1,21 @@
+2015-05-07 Dean Jackson <[email protected]>
+
+ [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 <[email protected]>
REGRESSION (r183300): Fixed elements flash when scrolling
Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js (183970 => 183971)
--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2015-05-08 01:46:59 UTC (rev 183970)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2015-05-08 01:55:08 UTC (rev 183971)
@@ -1362,7 +1362,7 @@
hideControls: function()
{
- if (this.controlsAlwaysVisible())
+ if (this.controlsAlwaysVisible() || this._potentiallyScrubbing)
return;
this.updateShouldListenForPlaybackTargetAvailabilityEvent();
Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js (183970 => 183971)
--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js 2015-05-08 01:46:59 UTC (rev 183970)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js 2015-05-08 01:55:08 UTC (rev 183971)
@@ -16,6 +16,7 @@
this._timelineIsHidden = false;
this._currentDisplayWidth = 0;
+ this._potentiallyScrubbing = false;
this.scheduleUpdateLayoutForDisplayedWidth();
host.controlsDependOnPageScaleFactor = true;
@@ -493,7 +494,7 @@
},
handleTimelineInput: function(event) {
- if (this.potentiallyScrubbing)
+ if (this._potentiallyScrubbing)
this.video.pause();
Controller.prototype.handleTimelineInput.call(this, event);
},
@@ -504,7 +505,7 @@
},
handleTimelineTouchStart: function(event) {
- this.potentiallyScrubbing = true;
+ this._potentiallyScrubbing = true;
this.wasPlayingWhenScrubbingStarted = !this.video.paused;
this.listenFor(this.controls.timeline, 'touchend', this.handleTimelineTouchEnd);
this.listenFor(this.controls.timeline, 'touchcancel', this.handleTimelineTouchEnd);
@@ -513,9 +514,11 @@
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._potentiallyScrubbing = false;
+ if (this.wasPlayingWhenScrubbingStarted && this.video.paused) {
this.video.play();
+ this.resetHideControlsTimer();
+ }
},
handleReadyStateChange: function(event) {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
