Changeset 152318 in webkit

Timestamp:

Jul 2, 2013 1:28:57 PM (11 years ago)

Author:

eric.carlson@apple.com

Message:

[Mac] .webkitClosedCaptionsVisible doesn't work with "Automatic" caption mode
​https://bugs.webkit.org/show_bug.cgi?id=118319

Reviewed by Darin Adler.

Source/WebCore:

Test: media/track/track-legacyapi-with-automatic-mode.html

• page/CaptionUserPreferencesMediaAF.cpp:

(WebCore::CaptionUserPreferencesMediaAF::textTrackSelectionScore): Don't apply "automatic"

logic when captions were enabled with .webkitClosedCaptionsVisible.

LayoutTests:

• media/track/track-legacyapi-with-automatic-mode-expected.txt: Added.
• media/track/track-legacyapi-with-automatic-mode.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/media/track/track-legacyapi-with-automatic-mode-expected.txt (added)
• LayoutTests/media/track/track-legacyapi-with-automatic-mode.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-07-02  Eric Carlson  <eric.carlson@apple.com>
+
+        [Mac] .webkitClosedCaptionsVisible doesn't work with "Automatic" caption mode
+        https://bugs.webkit.org/show_bug.cgi?id=118319
+
+        Reviewed by Darin Adler.
+
+        * media/track/track-legacyapi-with-automatic-mode-expected.txt: Added.
+        * media/track/track-legacyapi-with-automatic-mode.html: Added.
+
 2013-06-26  Robert Hogan  <robert@webkit.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-07-02  Eric Carlson  <eric.carlson@apple.com>
+
+        [Mac] .webkitClosedCaptionsVisible doesn't work with "Automatic" caption mode
+        https://bugs.webkit.org/show_bug.cgi?id=118319
+
+        Reviewed by Darin Adler.
+
+        Test: media/track/track-legacyapi-with-automatic-mode.html
+
+        * page/CaptionUserPreferencesMediaAF.cpp:
+        (WebCore::CaptionUserPreferencesMediaAF::textTrackSelectionScore): Don't apply "automatic"
+            logic when captions were enabled with .webkitClosedCaptionsVisible.
+
 2013-07-02  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp

@@ -681 +681 @@
     Vector<String> userPreferredCaptionLanguages = preferredLanguages();
 
-    if (displayMode == Automatic || trackHasOnlyForcedSubtitles) {
+    if ((displayMode == Automatic && !legacyOverride) || trackHasOnlyForcedSubtitles) {
 
         if (!mediaElement || !mediaElement->player())