Title: [148895] trunk/LayoutTests
- Revision
- 148895
- Author
- [email protected]
- Date
- 2013-04-22 11:11:44 -0700 (Mon, 22 Apr 2013)
Log Message
Unreviewed Mac gardening. Update a test and results now that forced text
tracks are supported.
* media/track/track-in-band-expected.txt:
* media/track/track-in-band.html:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (148894 => 148895)
--- trunk/LayoutTests/ChangeLog 2013-04-22 17:56:22 UTC (rev 148894)
+++ trunk/LayoutTests/ChangeLog 2013-04-22 18:11:44 UTC (rev 148895)
@@ -1,3 +1,11 @@
+2013-04-22 Eric Carlson <[email protected]>
+
+ Unreviewed Mac gardening. Update a test and results now that forced text
+ tracks are supported.
+
+ * media/track/track-in-band-expected.txt:
+ * media/track/track-in-band.html:
+
2013-04-22 Yi Shen <[email protected]>
Crash on OS X when shift clicking outside of input
Modified: trunk/LayoutTests/media/track/track-in-band-expected.txt (148894 => 148895)
--- trunk/LayoutTests/media/track/track-in-band-expected.txt 2013-04-22 17:56:22 UTC (rev 148894)
+++ trunk/LayoutTests/media/track/track-in-band-expected.txt 2013-04-22 18:11:44 UTC (rev 148895)
@@ -6,22 +6,34 @@
EVENT(addtrack)
EXPECTED (event.track == 'video.textTracks[1]') OK
+EVENT(addtrack)
+EXPECTED (event.track == 'video.textTracks[2]') OK
+
+EVENT(addtrack)
+EXPECTED (event.track == 'video.textTracks[3]') OK
+
EVENT(canplaythrough)
** Check initial in-band track states
-EXPECTED (video.textTracks.length == '2') OK
+EXPECTED (video.textTracks.length == '4') OK
RUN(inbandTrack1 = video.textTracks[0])
RUN(inbandTrack2 = video.textTracks[1])
+RUN(inbandTrack3 = video.textTracks[2])
+RUN(inbandTrack4 = video.textTracks[3])
EXPECTED (inbandTrack1.language == 'en') OK
EXPECTED (inbandTrack1.kind == 'subtitles') OK
-EXPECTED (inbandTrack2.language == 'fr') OK
-EXPECTED (inbandTrack2.kind == 'subtitles') OK
+EXPECTED (inbandTrack2.language == 'en') OK
+EXPECTED (inbandTrack2.kind == 'forced') OK
+EXPECTED (inbandTrack3.language == 'fr') OK
+EXPECTED (inbandTrack3.kind == 'subtitles') OK
+EXPECTED (inbandTrack4.language == 'fr') OK
+EXPECTED (inbandTrack4.kind == 'forced') OK
-** Add tracks, check sort order
+** Add two tracks, check sort order
RUN(addTrack = video.addTextTrack('captions', 'Caption Track', 'en'))
RUN(trackElement = document.createElement('track'))
RUN(video.appendChild(trackElement))
-EXPECTED (video.textTracks.length == '4') OK
+EXPECTED (video.textTracks.length == '6') OK
EXPECTED (video.textTracks[0] == 'trackElement.track') OK
EXPECTED (video.textTracks[1] == 'addTrack') OK
EXPECTED (video.textTracks[2] == 'inbandTrack1') OK
Modified: trunk/LayoutTests/media/track/track-in-band.html (148894 => 148895)
--- trunk/LayoutTests/media/track/track-in-band.html 2013-04-22 17:56:22 UTC (rev 148894)
+++ trunk/LayoutTests/media/track/track-in-band.html 2013-04-22 18:11:44 UTC (rev 148895)
@@ -26,20 +26,30 @@
function canplaythrough()
{
consoleWrite("<br><i>** Check initial in-band track states<" + "/i>");
- testExpected("video.textTracks.length", 2);
+ testExpected("video.textTracks.length", 4);
run("inbandTrack1 = video.textTracks[0]");
run("inbandTrack2 = video.textTracks[1]");
+ run("inbandTrack3 = video.textTracks[2]");
+ run("inbandTrack4 = video.textTracks[3]");
+
testExpected("inbandTrack1.language", "en");
testExpected("inbandTrack1.kind", "subtitles");
- testExpected("inbandTrack2.language", "fr");
- testExpected("inbandTrack2.kind", "subtitles");
- consoleWrite("<br><i>** Add tracks, check sort order<" + "/i>");
+ testExpected("inbandTrack2.language", "en");
+ testExpected("inbandTrack2.kind", "forced");
+
+ testExpected("inbandTrack3.language", "fr");
+ testExpected("inbandTrack3.kind", "subtitles");
+
+ testExpected("inbandTrack4.language", "fr");
+ testExpected("inbandTrack4.kind", "forced");
+
+ consoleWrite("<br><i>** Add two tracks, check sort order<" + "/i>");
run("addTrack = video.addTextTrack('captions', 'Caption Track', 'en')");
run("trackElement = document.createElement('track')");
trackElement.label = '<track>';
run("video.appendChild(trackElement)");
- testExpected("video.textTracks.length", 4);
+ testExpected("video.textTracks.length", 6);
compareTracks("video.textTracks[0]", "trackElement.track");
compareTracks("video.textTracks[1]", "addTrack");
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
