Title: [148688] trunk
- Revision
- 148688
- Author
- eric.carl...@apple.com
- Date
- 2013-04-18 11:03:11 -0700 (Thu, 18 Apr 2013)
Log Message
Forced subtitles never rendered
https://bugs.webkit.org/show_bug.cgi?id=114818
Source/WebCore:
Reviewed by Jer Noble.
No new tests, media/track/track-forced-subtitles-in-band.html was updated to test this change.
* html/track/TextTrack.cpp:
(WebCore::TextTrack::isRendered): "forced" tracks are rendered.
LayoutTests:
Update test to check that a forced cue is rendered.
Reviewed by Jer Noble.
* media/track/track-forced-subtitles-in-band-expected.txt:
* media/track/track-forced-subtitles-in-band.html:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (148687 => 148688)
--- trunk/LayoutTests/ChangeLog 2013-04-18 18:03:03 UTC (rev 148687)
+++ trunk/LayoutTests/ChangeLog 2013-04-18 18:03:11 UTC (rev 148688)
@@ -1,12 +1,15 @@
-2013-04-18 Martin Robinson <mrobin...@igalia.com>
+2013-04-18 Eric Carlson <eric.carl...@apple.com>
- [GTK] fast/canvas/DrawImageSinglePixelStretch.html fails
- https://bugs.webkit.org/show_bug.cgi?id=58309
+ Forced subtitles never rendered
+ https://bugs.webkit.org/show_bug.cgi?id=114818
- Reviewed by Alejandro G. Castro.
+ Update test to check that a forced cue is rendered.
- * platform/gtk/TestExpectations: Unskip a test which is now passing.
+ Reviewed by Jer Noble.
+ * media/track/track-forced-subtitles-in-band-expected.txt:
+ * media/track/track-forced-subtitles-in-band.html:
+
2013-04-18 Eric Carlson <eric.carl...@apple.com>
Flaky Test: media/track/track-mode.html
Modified: trunk/LayoutTests/media/track/track-forced-subtitles-in-band-expected.txt (148687 => 148688)
--- trunk/LayoutTests/media/track/track-forced-subtitles-in-band-expected.txt 2013-04-18 18:03:03 UTC (rev 148687)
+++ trunk/LayoutTests/media/track/track-forced-subtitles-in-band-expected.txt 2013-04-18 18:03:11 UTC (rev 148688)
@@ -48,5 +48,10 @@
EXPECTED (video.textTracks[8].kind == 'captions') OK
EXPECTED (video.textTracks[8].mode == 'disabled') OK
+RUN(video.currentTime = 9.5)
+EVENT(seeked)
+EXPECTED (video.textTracks[3].activeCues.length == '1') OK
+EXPECTED (textTrackDisplayElement(video, 'cue') != 'null') OK
+
END OF TEST
Modified: trunk/LayoutTests/media/track/track-forced-subtitles-in-band.html (148687 => 148688)
--- trunk/LayoutTests/media/track/track-forced-subtitles-in-band.html 2013-04-18 18:03:03 UTC (rev 148687)
+++ trunk/LayoutTests/media/track/track-forced-subtitles-in-band.html 2013-04-18 18:03:11 UTC (rev 148688)
@@ -9,6 +9,15 @@
<script>
var test = 0;
+ function seeked()
+ {
+ testExpected("video.textTracks[3].activeCues.length", 1);
+ testExpected("textTrackDisplayElement(video, 'cue')", null, "!=");
+ consoleWrite("");
+
+ endTest();
+ }
+
function testForced()
{
consoleWrite("<br><i>** Forced tracks should be in .textTracks, but not in the menu<" + "/i>");
@@ -68,7 +77,8 @@
testExpected("video.textTracks[8].mode", "disabled");
consoleWrite("");
- endTest();
+ waitForEvent('seeked', seeked);
+ run("video.currentTime = 9.5");
}
function setup()
Modified: trunk/Source/WebCore/ChangeLog (148687 => 148688)
--- trunk/Source/WebCore/ChangeLog 2013-04-18 18:03:03 UTC (rev 148687)
+++ trunk/Source/WebCore/ChangeLog 2013-04-18 18:03:11 UTC (rev 148688)
@@ -1,3 +1,15 @@
+2013-04-18 Eric Carlson <eric.carl...@apple.com>
+
+ Forced subtitles never rendered
+ https://bugs.webkit.org/show_bug.cgi?id=114818
+
+ Reviewed by Jer Noble.
+
+ No new tests, media/track/track-forced-subtitles-in-band.html was updated to test this change.
+
+ * html/track/TextTrack.cpp:
+ (WebCore::TextTrack::isRendered): "forced" tracks are rendered.
+
2013-04-17 Anders Carlsson <ander...@apple.com>
Change storage factory functions to take a PageGroup and Page respectively
Modified: trunk/Source/WebCore/html/track/TextTrack.cpp (148687 => 148688)
--- trunk/Source/WebCore/html/track/TextTrack.cpp 2013-04-18 18:03:03 UTC (rev 148687)
+++ trunk/Source/WebCore/html/track/TextTrack.cpp 2013-04-18 18:03:11 UTC (rev 148688)
@@ -439,7 +439,7 @@
bool TextTrack::isRendered()
{
- if (kind() != captionsKeyword() && kind() != subtitlesKeyword())
+ if (kind() != captionsKeyword() && kind() != subtitlesKeyword() && kind() != forcedKeyword())
return false;
if (m_mode != showingKeyword())
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
