Changeset 174972 in webkit

Timestamp:

Oct 21, 2014 9:28:34 AM (10 years ago)

Author:

jer.noble@apple.com

Message:

REGRESSION (r170808): Volume slider in built-in media controls only changes volume when thumb is released, not while dragging
​https://bugs.webkit.org/show_bug.cgi?id=137805

Reviewed by Dan Bernstein.

Source/WebCore:

Test: media/video-volume-slider-drag.html

Respond to the 'input' event rather than the 'change' event for the volume slider, so that
volume changes are continuous during drag operations.

Also listen for both 'input' and 'change' events for the timeline slider, doing fastSeek()
during 'input' and setting an explicit currentTime during 'change'. This is the same behavior
as current, but using 'change' instead of 'mouseup' to do the final currentTime change.

• Modules/mediacontrols/mediaControlsApple.js:

(Controller.prototype.createControls):
(Controller.prototype.handleTimelineInput):
(Controller.prototype.handleTimelineChange):
(Controller.prototype.handleTimelineMouseUp):
(Controller.prototype.handleVolumeSliderInput):
(Controller.prototype.handlePlayButtonClicked): Deleted.
(Controller.prototype.handleMaxButtonClicked): Deleted.

LayoutTests:

• media/video-volume-slider-drag-expected.txt: Added.
• media/video-volume-slider-drag.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/media/video-volume-slider-drag-expected.txt (added)
• LayoutTests/media/video-volume-slider-drag.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/mediacontrols/mediaControlsApple.js (modified) (5 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2014-10-21  Jer Noble  <jer.noble@apple.com>
+
+        REGRESSION (r170808): Volume slider in built-in media controls only changes volume when thumb is released, not while dragging
+        https://bugs.webkit.org/show_bug.cgi?id=137805
+
+        Reviewed by Dan Bernstein.
+
+        * media/video-volume-slider-drag-expected.txt: Added.
+        * media/video-volume-slider-drag.html: Added.
+
 2014-10-21  Manuel Rego Casasnovas  <rego@igalia.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-10-21  Jer Noble  <jer.noble@apple.com>
+
+        REGRESSION (r170808): Volume slider in built-in media controls only changes volume when thumb is released, not while dragging
+        https://bugs.webkit.org/show_bug.cgi?id=137805
+
+        Reviewed by Dan Bernstein.
+
+        Test: media/video-volume-slider-drag.html
+
+        Respond to the 'input' event rather than the 'change' event for the volume slider, so that
+        volume changes are continuous during drag operations.
+
+        Also listen for both 'input' and 'change' events for the timeline slider, doing fastSeek()
+        during 'input' and setting an explicit currentTime during 'change'. This is the same behavior
+        as current, but using 'change' instead of 'mouseup' to do the final currentTime change.
+
+        * Modules/mediacontrols/mediaControlsApple.js:
+        (Controller.prototype.createControls):
+        (Controller.prototype.handleTimelineInput):
+        (Controller.prototype.handleTimelineChange):
+        (Controller.prototype.handleTimelineMouseUp):
+        (Controller.prototype.handleVolumeSliderInput):
+        (Controller.prototype.handlePlayButtonClicked): Deleted.
+        (Controller.prototype.handleMaxButtonClicked): Deleted.
+
 2014-10-21  Manuel Rego Casasnovas  <rego@igalia.com>
 

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

@@ -335 +335 @@
         timeline.type = 'range';
         timeline.value = 0;
-        this.listenFor(timeline, 'input', this.handleTimelineChange);
+        this.listenFor(timeline, 'input', this.handleTimelineInput);
+        this.listenFor(timeline, 'change', this.handleTimelineChange);
         this.listenFor(timeline, 'mouseover', this.handleTimelineMouseOver);
         this.listenFor(timeline, 'mouseout', this.handleTimelineMouseOut);
@@ -386 +387 @@
         volume.max = 1;
         volume.step = .01;
-        this.listenFor(volume, 'change', this.handleVolumeSliderChange);
+        this.listenFor(volume, 'input', this.handleVolumeSliderInput);
 
         var captionButton = this.controls.captionButton = document.createElement('button');
@@ -741 +742 @@
     },
 
+    handleTimelineInput: function(event)
+    {
+        this.video.fastSeek(this.controls.timeline.value);
+    },
+
     handleTimelineChange: function(event)
     {
-        this.video.fastSeek(this.controls.timeline.value);
+        this.video.currentTime = this.controls.timeline.value;
     },
 
@@ -805 +811 @@
     {
         this.scrubbing = false;
-
-        // Do a precise seek when we lift the mouse:
-        this.video.currentTime = this.controls.timeline.value;
     },
 
@@ -837 +840 @@
     },
 
-    handleVolumeSliderChange: function(event)
+    handleVolumeSliderInput: function(event)
     {
         if (this.video.muted) {