Changeset 152721 in webkit

Timestamp:

Jul 16, 2013 8:12:46 AM (11 years ago)

Author:

eric.carlson@apple.com

Message:

HTMLMediaElement should not add cues for disabled text tracks
​https://bugs.webkit.org/show_bug.cgi?id=118682

Source/WebCore:

Reviewed by Ryosuke Niwa.

Merge ​https://src.chromium.org/viewvc/blink?view=rev&revision=153810

Tests: media/track/track-disabled-addcue.html

media/track/track-disabled.html

• html/HTMLMediaElement.cpp:

(WebCore::HTMLMediaElement::textTrackAddCues): Do nothing if the track is disabled.
(WebCore::HTMLMediaElement::textTrackAddCue): Ditto.

LayoutTests:

Merge ​https://src.chromium.org/viewvc/blink?view=rev&revision=153810

Reviewed by Ryosuke Niwa.

• media/track/track-disabled-addcue-expected.txt: Added.
• media/track/track-disabled-addcue.html: Added.
• media/track/track-disabled-expected.txt: Added.
• media/track/track-disabled.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/media/track/track-disabled-addcue-expected.txt (added)
• LayoutTests/media/track/track-disabled-addcue.html (added)
• LayoutTests/media/track/track-disabled-expected.txt (added)
• LayoutTests/media/track/track-disabled.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/HTMLMediaElement.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-07-16  Eric Carlson  <eric.carlson@apple.com>
+
+        HTMLMediaElement should not add cues for disabled text tracks
+        https://bugs.webkit.org/show_bug.cgi?id=118682
+
+        Merge https://src.chromium.org/viewvc/blink?view=rev&revision=153810
+
+        Reviewed by Ryosuke Niwa.
+
+        * media/track/track-disabled-addcue-expected.txt: Added.
+        * media/track/track-disabled-addcue.html: Added.
+        * media/track/track-disabled-expected.txt: Added.
+        * media/track/track-disabled.html: Added.
+
 2013-07-16  Anton Obzhirov  <a.obzhirov@samsung.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-07-16  Eric Carlson  <eric.carlson@apple.com>
+
+        HTMLMediaElement should not add cues for disabled text tracks
+        https://bugs.webkit.org/show_bug.cgi?id=118682
+
+        Reviewed by Ryosuke Niwa.
+
+        Merge https://src.chromium.org/viewvc/blink?view=rev&revision=153810
+
+        Tests: media/track/track-disabled-addcue.html
+               media/track/track-disabled.html
+
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::textTrackAddCues): Do nothing if the track is disabled.
+        (WebCore::HTMLMediaElement::textTrackAddCue): Ditto.
+
 2013-07-16  Krzysztof Czech  <k.czech@ymail.com>
 

trunk/Source/WebCore/html/HTMLMediaElement.cpp

@@ -1488 +1488 @@
 }
 
-void HTMLMediaElement::textTrackAddCues(TextTrack*, const TextTrackCueList* cues) 
-{
+void HTMLMediaElement::textTrackAddCues(TextTrack* track, const TextTrackCueList* cues) 
+{
+    if (track->mode() == TextTrack::disabledKeyword())
+        return;
+
     TrackDisplayUpdateScope scope(this);
     for (size_t i = 0; i < cues->length(); ++i)
-        textTrackAddCue(cues->item(i)->track(), cues->item(i));
+        textTrackAddCue(track, cues->item(i));
 }
 
@@ -1502 +1505 @@
 }
 
-void HTMLMediaElement::textTrackAddCue(TextTrack*, PassRefPtr<TextTrackCue> cue)
-{
+void HTMLMediaElement::textTrackAddCue(TextTrack* track, PassRefPtr<TextTrackCue> cue)
+{
+    if (track->mode() == TextTrack::disabledKeyword())
+        return;
+
     // Negative duration cues need be treated in the interval tree as
     // zero-length cues.