Title: [152333] trunk
- Revision
- 152333
- Author
- [email protected]
- Date
- 2013-07-02 17:48:43 -0700 (Tue, 02 Jul 2013)
Log Message
Unreviewed, rolling out r152318.
http://trac.webkit.org/changeset/152318
https://bugs.webkit.org/show_bug.cgi?id=118333
This patch broke media/track/track-automatic-subtitles.html on
Mac (Requested by dfarler on #webkit).
Source/WebCore:
* page/CaptionUserPreferencesMediaAF.cpp:
(WebCore::CaptionUserPreferencesMediaAF::textTrackSelectionScore):
LayoutTests:
* media/track/track-legacyapi-with-automatic-mode-expected.txt: Removed.
* media/track/track-legacyapi-with-automatic-mode.html: Removed.
Modified Paths
Removed Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (152332 => 152333)
--- trunk/LayoutTests/ChangeLog 2013-07-03 00:39:10 UTC (rev 152332)
+++ trunk/LayoutTests/ChangeLog 2013-07-03 00:48:43 UTC (rev 152333)
@@ -1,3 +1,15 @@
+2013-07-02 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r152318.
+ http://trac.webkit.org/changeset/152318
+ https://bugs.webkit.org/show_bug.cgi?id=118333
+
+ This patch broke media/track/track-automatic-subtitles.html on
+ Mac (Requested by dfarler on #webkit).
+
+ * media/track/track-legacyapi-with-automatic-mode-expected.txt: Removed.
+ * media/track/track-legacyapi-with-automatic-mode.html: Removed.
+
2013-07-02 Ruth Fong <[email protected]>
Change event should not be dispatched by clicking a scrollbar of select listbox
Deleted: trunk/LayoutTests/media/track/track-legacyapi-with-automatic-mode-expected.txt (152332 => 152333)
--- trunk/LayoutTests/media/track/track-legacyapi-with-automatic-mode-expected.txt 2013-07-03 00:39:10 UTC (rev 152332)
+++ trunk/LayoutTests/media/track/track-legacyapi-with-automatic-mode-expected.txt 2013-07-03 00:48:43 UTC (rev 152333)
@@ -1,30 +0,0 @@
-Test that enabling a track with .webkitClosedCaptionsVisible succeeds when in "automatic" mode.
-
-
-** Setup
-RUN(internals.setCaptionDisplayMode('Automatic'))
-RUN(trackElement = document.createElement('track'))
-RUN(trackElement.kind = 'captions')
-RUN(trackElement.src = '')
-RUN(video.appendChild(trackElement))
-
-EVENT(canplaythrough)
-
-** Test initial state
-EXPECTED (video.textTracks.length == '1') OK
-EXPECTED (video.textTracks[0].mode == 'disabled') OK
-
-** Enable cues, allow them to load
-RUN(video.webkitClosedCaptionsVisible = true)
-EVENT(load)
-EXPECTED (track.readyState == '2') OK
-RUN(video.currentTime = 0.5)
-
-EVENT(seeked)
-
-** Check to make sure captions are displaying
-EXPECTED (video.textTracks[0].cues != 'null') OK
-EXPECTED (textTrackDisplayElement(video, 'cue').textContent != 'null') OK
-
-END OF TEST
-
Deleted: trunk/LayoutTests/media/track/track-legacyapi-with-automatic-mode.html (152332 => 152333)
--- trunk/LayoutTests/media/track/track-legacyapi-with-automatic-mode.html 2013-07-03 00:39:10 UTC (rev 152332)
+++ trunk/LayoutTests/media/track/track-legacyapi-with-automatic-mode.html 2013-07-03 00:48:43 UTC (rev 152333)
@@ -1,67 +0,0 @@
-<!DOCTYPE html>
-<html>
- <head>
- <title>Enabling a track with legacy API succeeds when in "Automatic" mode</title>
-
- <script src=""
- <script src=""
- <script src=""
- <script src=""
- <script>
-
- function seeked()
- {
- consoleWrite("<br><i>** Check to make sure captions are displaying<" + "/i>");
-
- testExpected("video.textTracks[0].cues", null, '!=');
- testExpected("textTrackDisplayElement(video, 'cue').textContent", null, '!=');
-
- consoleWrite("");
- endTest();
- }
-
- function trackLoaded()
- {
- consoleWrite("EVENT(load)");
- track = event.target;
- testExpected("track.readyState", HTMLTrackElement.LOADED);
- run("video.currentTime = 0.5");
- waitForEvent('seeked', seeked);
- consoleWrite("");
- }
-
- function canplaythrough()
- {
- consoleWrite("<br><i>** Test initial state<" + "/i>");
- testExpected("video.textTracks.length", 1);
- testExpected("video.textTracks[0].mode", "disabled");
-
- consoleWrite("<br><i>** Enable cues, allow them to load<" + "/i>");
- run("video.webkitClosedCaptionsVisible = true");
- }
-
- function setup()
- {
- consoleWrite("<br><i>** Setup<" + "/i>");
- findMediaElement();
-
- if (window.internals)
- run("internals.setCaptionDisplayMode('Automatic')");
- run("trackElement = document.createElement('track')");
- run("trackElement.kind = 'captions'");
- run("trackElement.src = ''");
- run("video.appendChild(trackElement)");
-
- video.src = "" '../content/test');
- trackElement.setAttribute('onload', 'trackLoaded()');
- waitForEvent('canplaythrough', canplaythrough);
- consoleWrite("");
- }
-
- </script>
- </head>
- <body _onload_="setup()">
- <video controls width=500></video>
- <p>Test that enabling a track with .webkitClosedCaptionsVisible succeeds when in "automatic" mode.</p>
- </body>
-</html>
Modified: trunk/Source/WebCore/ChangeLog (152332 => 152333)
--- trunk/Source/WebCore/ChangeLog 2013-07-03 00:39:10 UTC (rev 152332)
+++ trunk/Source/WebCore/ChangeLog 2013-07-03 00:48:43 UTC (rev 152333)
@@ -1,3 +1,15 @@
+2013-07-02 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r152318.
+ http://trac.webkit.org/changeset/152318
+ https://bugs.webkit.org/show_bug.cgi?id=118333
+
+ This patch broke media/track/track-automatic-subtitles.html on
+ Mac (Requested by dfarler on #webkit).
+
+ * page/CaptionUserPreferencesMediaAF.cpp:
+ (WebCore::CaptionUserPreferencesMediaAF::textTrackSelectionScore):
+
2013-07-02 Ruth Fong <[email protected]>
Change event should not be dispatched by clicking a scrollbar of select listbox
Modified: trunk/Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp (152332 => 152333)
--- trunk/Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp 2013-07-03 00:39:10 UTC (rev 152332)
+++ trunk/Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp 2013-07-03 00:48:43 UTC (rev 152333)
@@ -680,7 +680,7 @@
Vector<String> userPreferredCaptionLanguages = preferredLanguages();
- if ((displayMode == Automatic && !legacyOverride) || trackHasOnlyForcedSubtitles) {
+ if (displayMode == Automatic || trackHasOnlyForcedSubtitles) {
if (!mediaElement || !mediaElement->player())
return 0;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
