Changeset 139932 in webkit

Timestamp:

Jan 16, 2013 3:57:50 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Cues not rendered when they should be
​https://bugs.webkit.org/show_bug.cgi?id=106943

Patch by Victor Carbune <​vcarbune@chromium.org> on 2013-01-16
Reviewed by Eric Carlson.

Source/WebCore:

Forced rendering update, even if the active set of cues didn't change.

Test: media/track/track-cue-rendering-mode-changed.html

• html/HTMLMediaElement.cpp:

(WebCore::HTMLMediaElement::updateActiveTextTrackCues): If exiting early,
update the cues rendered by the text track container.
(WebCore::HTMLMediaElement::textTrackModeChanged): Trigger update of the
re-checking the active cues and render the ones not yet on screen.

LayoutTests:

• media/track/track-cue-rendering-mode-changed-expected.txt: Added.
• media/track/track-cue-rendering-mode-changed.html: Added.
• media/video-controls-captions-expected.txt: Updated.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/media/track/track-cue-rendering-mode-changed-expected.txt (added)
• LayoutTests/media/track/track-cue-rendering-mode-changed.html (added)
• LayoutTests/media/video-controls-captions-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/HTMLMediaElement.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-01-16  Victor Carbune  <vcarbune@chromium.org>
+
+        Cues not rendered when they should be
+        https://bugs.webkit.org/show_bug.cgi?id=106943
+
+        Reviewed by Eric Carlson.
+
+        * media/track/track-cue-rendering-mode-changed-expected.txt: Added.
+        * media/track/track-cue-rendering-mode-changed.html: Added.
+        * media/video-controls-captions-expected.txt: Updated.
+
 2013-01-16  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/LayoutTests/media/video-controls-captions-expected.txt

@@ -13 +13 @@
 EXPECTED (video.textTracks.length == '1') OK
 EXPECTED (video.textTracks[0].mode == 'disabled') OK
-Failed to find text track container element
+No text track cue with display id '-webkit-media-text-track-display' is currently visible
 
 ** Captions track should load and captions should become visible after button is clicked **

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-16  Victor Carbune  <vcarbune@chromium.org>
+
+        Cues not rendered when they should be
+        https://bugs.webkit.org/show_bug.cgi?id=106943
+
+        Reviewed by Eric Carlson.
+
+        Forced rendering update, even if the active set of cues didn't change.
+
+        Test: media/track/track-cue-rendering-mode-changed.html
+
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::updateActiveTextTrackCues): If exiting early,
+        update the cues rendered by the text track container.
+        (WebCore::HTMLMediaElement::textTrackModeChanged): Trigger update of the
+        re-checking the active cues and render the ones not yet on screen.
+
 2013-01-16  Benjamin Poulain  <bpoulain@apple.com>
 

trunk/Source/WebCore/html/HTMLMediaElement.cpp

@@ -1167 +1167 @@
     }
 
-    if (!activeSetChanged)
-        return;
+    if (!activeSetChanged) {
+        // Even though the active set has not changed, it is possible that the
+        // the mode of a track has changed from 'hidden' to 'showing' and the
+        // cues have not yet been rendered.
+        if (hasMediaControls())
+            mediaControls()->updateTextTrackDisplay();
+
+        return;
+    }
 
     // 7 - If the time was reached through the usual monotonic increase of the
@@ -1362 +1369 @@
 
     configureTextTrackDisplay();
+    updateActiveTextTrackCues(currentTime());
 }