Title: [134274] branches/chromium/1312
- Revision
- 134274
- Author
- [email protected]
- Date
- 2012-11-12 11:50:40 -0800 (Mon, 12 Nov 2012)
Log Message
Merge 133610
BUG=159098
Review URL: https://codereview.chromium.org/11377110
Modified Paths
Diff
Modified: branches/chromium/1312/LayoutTests/media/track/track-add-remove-cue-expected.txt (134273 => 134274)
--- branches/chromium/1312/LayoutTests/media/track/track-add-remove-cue-expected.txt 2012-11-12 19:48:29 UTC (rev 134273)
+++ branches/chromium/1312/LayoutTests/media/track/track-add-remove-cue-expected.txt 2012-11-12 19:50:40 UTC (rev 134274)
@@ -71,5 +71,13 @@
*** Try to remove the cue again.
TEST(testTrack.track.removeCue(textCue)) THROWS(DOMException.INVALID_STATE_ERR) OK
+
+*** Add a cue before all the existing cues.
+RUN(testTrack.track.addCue(new TextTrackCue(0, 31, 'I am first')))
+EXPECTED (cues[0].startTime == '0') OK
+EXPECTED (cues[0].endTime == '31') OK
+EXPECTED (cues[1].startTime == '0') OK
+EXPECTED (cues[1].endTime == '30.5') OK
+EXPECTED (cues[2].startTime == '31') OK
END OF TEST
Modified: branches/chromium/1312/LayoutTests/media/track/track-add-remove-cue.html (134273 => 134274)
--- branches/chromium/1312/LayoutTests/media/track/track-add-remove-cue.html 2012-11-12 19:48:29 UTC (rev 134273)
+++ branches/chromium/1312/LayoutTests/media/track/track-add-remove-cue.html 2012-11-12 19:50:40 UTC (rev 134274)
@@ -87,6 +87,13 @@
consoleWrite("<br>*** Try to remove the cue again.");
testException("testTrack.track.removeCue(textCue)", "DOMException.INVALID_STATE_ERR");
+ consoleWrite("<br>*** Add a cue before all the existing cues.");
+ run("testTrack.track.addCue(new TextTrackCue(0, 31, 'I am first'))");
+ testExpected("cues[0].startTime", 0);
+ testExpected("cues[0].endTime", 31);
+ testExpected("cues[1].startTime", 0);
+ testExpected("cues[1].endTime", 30.5);
+ testExpected("cues[2].startTime", 31);
endTest();
}
Modified: branches/chromium/1312/Source/WebCore/html/track/TextTrackCueList.cpp (134273 => 134274)
--- branches/chromium/1312/Source/WebCore/html/track/TextTrackCueList.cpp 2012-11-12 19:48:29 UTC (rev 134273)
+++ branches/chromium/1312/Source/WebCore/html/track/TextTrackCueList.cpp 2012-11-12 19:50:40 UTC (rev 134274)
@@ -92,12 +92,12 @@
// http://www.whatwg.org/specs/web-apps/current-work/#text-track-cue-order
RefPtr<TextTrackCue> cue = prpCue;
if (start == end) {
- if (!m_list.isEmpty() && (m_list[start - 1].get() == cue.get()))
+ if (!m_list.isEmpty() && (start > 0) && (m_list[start - 1].get() == cue.get()))
return false;
- m_list.insert(start, cue);
- invalidateCueIndexes(start);
- return true;
+ m_list.insert(start, cue);
+ invalidateCueIndexes(start);
+ return true;
}
size_t index = (start + end) / 2;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
