Diff
Modified: branches/safari-537-branch/LayoutTests/ChangeLog (152990 => 152991)
--- branches/safari-537-branch/LayoutTests/ChangeLog 2013-07-22 20:56:30 UTC (rev 152990)
+++ branches/safari-537-branch/LayoutTests/ChangeLog 2013-07-22 21:07:06 UTC (rev 152991)
@@ -1,3 +1,21 @@
+2013-07-22 Lucas Forschler <[email protected]>
+
+ Merge r152721
+
+ 2013-07-16 Eric Carlson <[email protected]>
+
+ 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-19 Lucas Forschler <[email protected]>
Merge r152813
Copied: branches/safari-537-branch/LayoutTests/media/track/track-disabled-addcue-expected.txt (from rev 152721, trunk/LayoutTests/media/track/track-disabled-addcue-expected.txt) (0 => 152991)
--- branches/safari-537-branch/LayoutTests/media/track/track-disabled-addcue-expected.txt (rev 0)
+++ branches/safari-537-branch/LayoutTests/media/track/track-disabled-addcue-expected.txt 2013-07-22 21:07:06 UTC (rev 152991)
@@ -0,0 +1,7 @@
+Test adding cues to a disabled text track.
+
+Waiting for 2 cue durations to elapse.
+2 cue durations have elapsed.
+
+END OF TEST
+
Copied: branches/safari-537-branch/LayoutTests/media/track/track-disabled-addcue.html (from rev 152721, trunk/LayoutTests/media/track/track-disabled-addcue.html) (0 => 152991)
--- branches/safari-537-branch/LayoutTests/media/track/track-disabled-addcue.html (rev 0)
+++ branches/safari-537-branch/LayoutTests/media/track/track-disabled-addcue.html 2013-07-22 21:07:06 UTC (rev 152991)
@@ -0,0 +1,45 @@
+<!DOCTYPE html>
+<html>
+ <head>
+ <script src=""
+ <script src=""
+ <script>
+ function onLoad()
+ {
+ findMediaElement();
+ video.src = "" '../content/test');
+
+ var cueDuration = 0.1;
+ var track = video.addTextTrack("subtitles");
+ track.mode = "disabled";
+
+ for (var i = 0; i < 10; ++i) {
+ var start = i * cueDuration;
+ var end = start + cueDuration;
+ track.addCue(new TextTrackCue(start, end, "Test Cue " + i));
+ }
+
+ consoleWrite("Waiting for 2 cue durations to elapse.");
+
+ video.addEventListener('timeupdate', function (e)
+ {
+ if (e.target.currentTime < 2 * cueDuration)
+ return;
+
+ // End test after at least 2 cueDurations to make sure the test
+ // doesn't crash during the period the first 2 cues would have been
+ // rendered if the track was not disabled.
+ consoleWrite("2 cue durations have elapsed.<br>");
+ endTest();
+ });
+ video.play();
+ }
+
+ </script>
+ </head>
+
+ <body _onload_="onLoad()">
+ <p>Test adding cues to a disabled text track. </p>
+ <video id="vid" controls></video>
+ </body>
+</html>
Copied: branches/safari-537-branch/LayoutTests/media/track/track-disabled-expected.txt (from rev 152721, trunk/LayoutTests/media/track/track-disabled-expected.txt) (0 => 152991)
--- branches/safari-537-branch/LayoutTests/media/track/track-disabled-expected.txt (rev 0)
+++ branches/safari-537-branch/LayoutTests/media/track/track-disabled-expected.txt 2013-07-22 21:07:06 UTC (rev 152991)
@@ -0,0 +1,6 @@
+EVENT(loadstart)
+Waiting for the duration of the first cue to elapse.
+The duration of the first cue has elapsed.
+
+END OF TEST
+
Copied: branches/safari-537-branch/LayoutTests/media/track/track-disabled.html (from rev 152721, trunk/LayoutTests/media/track/track-disabled.html) (0 => 152991)
--- branches/safari-537-branch/LayoutTests/media/track/track-disabled.html (rev 0)
+++ branches/safari-537-branch/LayoutTests/media/track/track-disabled.html 2013-07-22 21:07:06 UTC (rev 152991)
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<html>
+ <head>
+ <script src=""
+ <script src=""
+ <script>
+ waitForEvent('loadstart', function ()
+ {
+ var video = document.getElementById('vid');
+ video.textTracks[0].mode = "disabled";
+
+ consoleWrite("Waiting for the duration of the first cue to elapse.");
+ video.addEventListener('timeupdate', function (e)
+ {
+ if (e.target.currentTime < 1)
+ return;
+
+ // End test after the duration of the first cue to make sure the test
+ // doesn't crash during the period this cue would have been
+ // rendered if the track was not disabled.
+ consoleWrite("The duration of the first cue has elapsed.<br>");
+ endTest();
+ });
+ });
+
+ function start()
+ {
+ findMediaElement();
+ video.src = "" '../content/test');
+ }
+
+ </script>
+ </head>
+ <body _onload_="start()">
+ <video id="vid" autoplay controls>
+ <track kind='subtitles' srclang='en' label='English' src='' />
+ </video>
+ </body>
+</html>
Modified: branches/safari-537-branch/Source/WebCore/ChangeLog (152990 => 152991)
--- branches/safari-537-branch/Source/WebCore/ChangeLog 2013-07-22 20:56:30 UTC (rev 152990)
+++ branches/safari-537-branch/Source/WebCore/ChangeLog 2013-07-22 21:07:06 UTC (rev 152991)
@@ -1,3 +1,23 @@
+2013-07-22 Lucas Forschler <[email protected]>
+
+ Merge r152721
+
+ 2013-07-16 Eric Carlson <[email protected]>
+
+ 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 Lucas Forschler <[email protected]>
Merge r152701
Modified: branches/safari-537-branch/Source/WebCore/html/HTMLMediaElement.cpp (152990 => 152991)
--- branches/safari-537-branch/Source/WebCore/html/HTMLMediaElement.cpp 2013-07-22 20:56:30 UTC (rev 152990)
+++ branches/safari-537-branch/Source/WebCore/html/HTMLMediaElement.cpp 2013-07-22 21:07:06 UTC (rev 152991)
@@ -1488,11 +1488,14 @@
updateActiveTextTrackCues(currentTime());
}
-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));
}
void HTMLMediaElement::textTrackRemoveCues(TextTrack*, const TextTrackCueList* cues)
@@ -1502,8 +1505,11 @@
textTrackRemoveCue(cues->item(i)->track(), cues->item(i));
}
-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.
double endTime = max(cue->startTime(), cue->endTime());