Changeset 148688 in webkit

Timestamp:

Apr 18, 2013 11:03:11 AM (11 years ago)

Author:

eric.carlson@apple.com

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:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/media/track/track-forced-subtitles-in-band-expected.txt (modified) (1 diff)
• LayoutTests/media/track/track-forced-subtitles-in-band.html (modified) (2 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/track/TextTrack.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ -1 @@
-2013-04-18  Martin Robinson  <mrobinson@igalia.com>
-
-        [GTK] fast/canvas/DrawImageSinglePixelStretch.html fails
-        https://bugs.webkit.org/show_bug.cgi?id=58309
-
-        Reviewed by Alejandro G. Castro.
-
-        * platform/gtk/TestExpectations: Unskip a test which is now passing.
+2013-04-18  Eric Carlson  <eric.carlson@apple.com>
+
+        Forced subtitles never rendered
+        https://bugs.webkit.org/show_bug.cgi?id=114818
+
+        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:
 
 2013-04-18  Eric Carlson  <eric.carlson@apple.com>

trunk/LayoutTests/media/track/track-forced-subtitles-in-band-expected.txt

@@ -49 +49 @@
 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
 

trunk/LayoutTests/media/track/track-forced-subtitles-in-band.html

@@ -9 +9 @@
         <script>
             var test = 0;
+
+            function seeked()
+            {
+                testExpected("video.textTracks[3].activeCues.length", 1);
+                testExpected("textTrackDisplayElement(video, 'cue')", null, "!=");
+                consoleWrite("");
+
+                endTest();
+            }
 
             function testForced()
@@ -69 +78 @@
                 consoleWrite("");
 
-                endTest();
+                waitForEvent('seeked', seeked);
+                run("video.currentTime = 9.5");
             }
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-04-18  Eric Carlson  <eric.carlson@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  <andersca@apple.com>
 

trunk/Source/WebCore/html/track/TextTrack.cpp

@@ -440 +440 @@
 bool TextTrack::isRendered()
 {
-    if (kind() != captionsKeyword() && kind() != subtitlesKeyword())
+    if (kind() != captionsKeyword() && kind() != subtitlesKeyword() && kind() != forcedKeyword())
         return false;