HTMLMediaElement should not add cues for disabled text tracks
authoreric.carlson@apple.com <eric.carlson@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 16 Jul 2013 15:12:46 +0000 (15:12 +0000)
committereric.carlson@apple.com <eric.carlson@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 16 Jul 2013 15:12:46 +0000 (15:12 +0000)
commit24250feca528f1dfccd56b29a45cfeed0e832372
tree3fb511848ff006c036427080c8d1e8cae7e890d2
parent84642f755a1a79f1562d8b4ba63894329f1008f9
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.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@152721 268f45cc-cd09-0410-ab3c-d52691b4dbfc
LayoutTests/ChangeLog
LayoutTests/media/track/track-disabled-addcue-expected.txt [new file with mode: 0644]
LayoutTests/media/track/track-disabled-addcue.html [new file with mode: 0644]
LayoutTests/media/track/track-disabled-expected.txt [new file with mode: 0644]
LayoutTests/media/track/track-disabled.html [new file with mode: 0644]
Source/WebCore/ChangeLog
Source/WebCore/html/HTMLMediaElement.cpp