Changeset 176139 in webkit

Timestamp:

Nov 14, 2014 1:55:40 PM (10 years ago)

Author:

dino@apple.com

Message:

[Media] Timeline scrubber not updating as the video plays
​https://bugs.webkit.org/show_bug.cgi?id=138717
<rdar://problem/18957509>

Reviewed by Jer Noble.

Source/WebCore:

There is some confusing logic that determines
whether or not the controls are hidden, and a
slight error caused timelines to not advance unless
they were explicitly showing.

The fix was to be a bit more liberal in deciding
when the controls are showing, but still cautious
enough to stop up causing repaints when things
are hidden.

Test: media/media-controls-timeline-updates.html

• Modules/mediacontrols/mediaControlsApple.js:

(Controller.prototype.controlsAreHidden): We only need
to check if we're an audio element or explicitly
hidden.
(Controller.prototype.showControls): Explicitly call
updateTime.

LayoutTests:

Tests that an inline video will actually advance the
timeline scrubber if it plays momentarily.

Eric wrote all the hard bits here. I just changed
a few lines to test if the timeline had moved from 0.
Unfortunately we can't rely on the timeline value
being identical to the currentTime of the media element,
because we only move the timeline when we get events.

• media/media-controls-timeline-updates.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/media/media-controls-timeline-updates-expected.txt (added)
• LayoutTests/media/media-controls-timeline-updates.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/mediacontrols/mediaControlsApple.js (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2014-11-14  Dean Jackson  <dino@apple.com>
+
+        [Media] Timeline scrubber not updating as the video plays
+        https://bugs.webkit.org/show_bug.cgi?id=138717
+        <rdar://problem/18957509>
+
+        Reviewed by Jer Noble.
+
+        Tests that an inline video will actually advance the
+        timeline scrubber if it plays momentarily.
+
+        Eric wrote all the hard bits here. I just changed
+        a few lines to test if the timeline had moved from 0.
+        Unfortunately we can't rely on the timeline value
+        being identical to the currentTime of the media element,
+        because we only move the timeline when we get events.
+
+        * media/media-controls-timeline-updates.html: Added.
+
 2014-11-14  Myles C. Maxfield  <mmaxfield@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-11-14  Dean Jackson  <dino@apple.com>
+
+        [Media] Timeline scrubber not updating as the video plays
+        https://bugs.webkit.org/show_bug.cgi?id=138717
+        <rdar://problem/18957509>
+
+        Reviewed by Jer Noble.
+
+        There is some confusing logic that determines
+        whether or not the controls are hidden, and a
+        slight error caused timelines to not advance unless
+        they were explicitly showing.
+
+        The fix was to be a bit more liberal in deciding
+        when the controls are showing, but still cautious
+        enough to stop up causing repaints when things
+        are hidden.
+
+        Test: media/media-controls-timeline-updates.html
+
+        * Modules/mediacontrols/mediaControlsApple.js:
+        (Controller.prototype.controlsAreHidden): We only need
+        to check if we're an audio element or explicitly
+        hidden.
+        (Controller.prototype.showControls): Explicitly call
+        updateTime.
+
 2014-11-14  Tim Horton  <timothy_horton@apple.com>
 

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

@@ -1036 +1036 @@
     showControls: function()
     {
+        this.setNeedsTimelineMetricsUpdate();
+
+        this.updateTime();
+        this.updateProgress(true);
+
         this.controls.panel.classList.add(this.ClassNames.show);
         this.controls.panel.classList.remove(this.ClassNames.hidden);
-
-        this.setNeedsTimelineMetricsUpdate();
     },
 
@@ -1049 +1052 @@
     controlsAreHidden: function()
     {
-        return !this.isAudio() && (!this.controls.panel.classList.contains(this.ClassNames.show) || this.controls.panel.classList.contains(this.ClassNames.hidden));
+        return !this.isAudio() && this.controls.panel.classList.contains(this.ClassNames.hidden);
     },