Added code to enable the first caption track if the user has requested captions and one such track …

Source/WebCore/html/HTMLMediaElement.cpp

 /*
  * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 2937 matching lines @@
             //    Let the text track mode be showing by default.
             defaultTrack = textTrack;
         }
     }
 
     if (!trackToEnable && defaultTrack)
         trackToEnable = defaultTrack;
 
     // If no track matches the user's preferred language and non was marked 'default', enable the first track
     // because the user has explicitly stated a preference for this kind of track.
-    if (!trackToEnable && fallbackTrack)
-        trackToEnable = fallbackTrack;
+    if (!trackToEnable) {
+        if (fallbackTrack)
+            trackToEnable = fallbackTrack;
+        else if (group.kind == TrackGroup::CaptionsAndSubtitles && m_closedCaptionsVisible)
+            trackToEnable = group.tracks[0];
+    }
 
     if (currentlyEnabledTracks.size()) {
         for (size_t i = 0; i < currentlyEnabledTracks.size(); ++i) {
             RefPtr<TextTrack> textTrack = currentlyEnabledTracks[i];
             if (textTrack != trackToEnable)
                 textTrack->setMode(TextTrack::disabledKeyword());
         }
     }
 
     if (trackToEnable)
         trackToEnable->setMode(TextTrack::showingKeyword());
-
-    m_processingPreferenceChange = false;
 }
 
 void HTMLMediaElement::setSelectedTextTrack(TextTrack* trackToSelect)
 {
     TextTrackList* trackList = textTracks();
     if (!trackList || !trackList->length())
         return;
     if (trackToSelect && !trackList->contains(trackToSelect))
         return;
 
@@ skipping 957 matching lines @@
 bool HTMLMediaElement::closedCaptionsVisible() const
 {
     return m_closedCaptionsVisible;
 }
 
 #if ENABLE(VIDEO_TRACK)
 void HTMLMediaElement::updateTextTrackDisplay()
 {
     if (!hasMediaControls() && !createMediaControls())
         return;
-    
+
     mediaControls()->updateTextTrackDisplay();
 }
 #endif
 
 void HTMLMediaElement::setClosedCaptionsVisible(bool closedCaptionVisible)
 {
     LOG(Media, "HTMLMediaElement::setClosedCaptionsVisible(%s)", boolString(closedCaptionVisible));
 
     if (!m_player || !hasClosedCaptions())
         return;
 
     m_closedCaptionsVisible = closedCaptionVisible;
     m_player->setClosedCaptionsVisible(closedCaptionVisible);
 
 #if ENABLE(VIDEO_TRACK)
     if (RuntimeEnabledFeatures::webkitVideoTrackEnabled()) {
         m_processingPreferenceChange = true;
         markCaptionAndSubtitleTracksAsUnconfigured();
+        m_processingPreferenceChange = false;
+
+        // If the user has enabled captions and no track that is available for

[vcarbune.chromium, 2013/04/20 00:30:12]

I have removed this part, as it was merely a work-around the real issue.

+        // display has been enable due to not passing the criteria according to
+        // user preferences or language, enable the first track that can be rendered.
+        if (closedCaptionsVisible && !m_haveVisibleTextTrack)

[abarth-chromium, 2013/04/18 05:36:39]

Multiline if statements require { } even if they contain only one statement.

+            for (size_t i = 0; i < m_textTracks->length(); ++i) {
+                RefPtr<TextTrack> track = m_textTracks->item(i);

[abarth-chromium, 2013/04/18 05:36:39]

Why RefPtr rather than just TextTrack* ?

+                if (track->kind() == TextTrack::captionsKeyword() ||
+                        track->kind() == TextTrack::subtitlesKeyword()) {
+                    track->setMode(TextTrack::showingKeyword());
+                    break;
+                }
+            }
+
         updateTextTrackDisplay();
     }
 #else
     if (hasMediaControls())
         mediaControls()->changedClosedCaptionsVisibility();
 #endif
 }
 
 void HTMLMediaElement::setWebkitClosedCaptionsVisible(bool visible)
 {
@@ skipping 136 matching lines @@
     if (!hasMediaControls() && !createMediaControls())
         return;
 
     mediaControls()->show();
 }
 
 #if ENABLE(VIDEO_TRACK)
 void HTMLMediaElement::configureTextTrackDisplay()
 {
     ASSERT(m_textTracks);
+    LOG(Media, "HTMLMediaElement::configureTextTrackDisplay");
 
     if (m_processingPreferenceChange)
         return;
 
     bool haveVisibleTextTrack = false;
     for (unsigned i = 0; i < m_textTracks->length(); ++i) {
         if (m_textTracks->item(i)->mode() == TextTrack::showingKeyword()) {
             haveVisibleTextTrack = true;
             break;
         }
@@ skipping 30 matching lines @@
 {
     if (!m_textTracks)
         return;
 
     // Mark all tracks as not "configured" so that configureTextTracks()
     // will reconsider which tracks to display in light of new user preferences
     // (e.g. default tracks should not be displayed if the user has turned off
     // captions and non-default tracks should be displayed based on language
     // preferences if the user has turned captions on).
     for (unsigned i = 0; i < m_textTracks->length(); ++i) {
-        
         RefPtr<TextTrack> textTrack = m_textTracks->item(i);
         String kind = textTrack->kind();
 
         if (kind == TextTrack::subtitlesKeyword() || kind == TextTrack::captionsKeyword())
             textTrack->setHasBeenConfigured(false);
     }
     configureTextTracks();
 }
 
 #endif
@@ skipping 350 matching lines @@
     info.addMember(m_mediaController, "mediaController");
 
 #if ENABLE(WEB_AUDIO)
     info.addMember(m_audioSourceNode, "audioSourceNode");
 #endif
 
 }
 
 }
 #endif