Changeset 152721 in webkit
- Timestamp:
- Jul 16, 2013 8:12:46 AM (11 years ago)
- Location:
- trunk
- Files:
-
- 4 added
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r152718 r152721 1 2013-07-16 Eric Carlson <eric.carlson@apple.com> 2 3 HTMLMediaElement should not add cues for disabled text tracks 4 https://bugs.webkit.org/show_bug.cgi?id=118682 5 6 Merge https://src.chromium.org/viewvc/blink?view=rev&revision=153810 7 8 Reviewed by Ryosuke Niwa. 9 10 * media/track/track-disabled-addcue-expected.txt: Added. 11 * media/track/track-disabled-addcue.html: Added. 12 * media/track/track-disabled-expected.txt: Added. 13 * media/track/track-disabled.html: Added. 14 1 15 2013-07-16 Anton Obzhirov <a.obzhirov@samsung.com> 2 16 -
trunk/Source/WebCore/ChangeLog
r152716 r152721 1 2013-07-16 Eric Carlson <eric.carlson@apple.com> 2 3 HTMLMediaElement should not add cues for disabled text tracks 4 https://bugs.webkit.org/show_bug.cgi?id=118682 5 6 Reviewed by Ryosuke Niwa. 7 8 Merge https://src.chromium.org/viewvc/blink?view=rev&revision=153810 9 10 Tests: media/track/track-disabled-addcue.html 11 media/track/track-disabled.html 12 13 * html/HTMLMediaElement.cpp: 14 (WebCore::HTMLMediaElement::textTrackAddCues): Do nothing if the track is disabled. 15 (WebCore::HTMLMediaElement::textTrackAddCue): Ditto. 16 1 17 2013-07-16 Krzysztof Czech <k.czech@ymail.com> 2 18 -
trunk/Source/WebCore/html/HTMLMediaElement.cpp
r152614 r152721 1488 1488 } 1489 1489 1490 void HTMLMediaElement::textTrackAddCues(TextTrack*, const TextTrackCueList* cues) 1491 { 1490 void HTMLMediaElement::textTrackAddCues(TextTrack* track, const TextTrackCueList* cues) 1491 { 1492 if (track->mode() == TextTrack::disabledKeyword()) 1493 return; 1494 1492 1495 TrackDisplayUpdateScope scope(this); 1493 1496 for (size_t i = 0; i < cues->length(); ++i) 1494 textTrackAddCue( cues->item(i)->track(), cues->item(i));1497 textTrackAddCue(track, cues->item(i)); 1495 1498 } 1496 1499 … … 1502 1505 } 1503 1506 1504 void HTMLMediaElement::textTrackAddCue(TextTrack*, PassRefPtr<TextTrackCue> cue) 1505 { 1507 void HTMLMediaElement::textTrackAddCue(TextTrack* track, PassRefPtr<TextTrackCue> cue) 1508 { 1509 if (track->mode() == TextTrack::disabledKeyword()) 1510 return; 1511 1506 1512 // Negative duration cues need be treated in the interval tree as 1507 1513 // zero-length cues.
Note: See TracChangeset
for help on using the changeset viewer.