Hook up Android closed captions 'enabled' setting to Blink

Source/core/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 2484 matching lines @@
 {
     if (!m_textTracks || !m_textTracks->length())
         return;
 
     AutomaticTrackSelection::Configuration configuration;
     if (m_processingPreferenceChange)
         configuration.disableCurrentlyEnabledTracks = true;
     if (m_closedCaptionsVisible)
         configuration.forceEnableSubtitleOrCaptionTrack = true;
 
+    Settings* settings = document().settings();
+    if (settings)
+        configuration.textTrackKindUserPreference = settings->textTrackKindUserPreference();
+
     AutomaticTrackSelection trackSelection(configuration);
     trackSelection.perform(*m_textTracks);
 
     textTracksChanged();
 }
 
 bool HTMLMediaElement::havePotentialSourceChild()
 {
     // Stash the current <source> node and next nodes so we can restore them after checking
     // to see there is another potential.
@@ skipping 756 matching lines @@
     m_processingPreferenceChange = true;
     honorUserPreferencesForAutomaticTextTrackSelection();
     m_processingPreferenceChange = false;
 
     // As track visibility changed while m_processingPreferenceChange was set,
     // there was no call to updateTextTrackDisplay(). This call is not in the
     // spec, see the note in configureTextTrackDisplay().
     updateTextTrackDisplay();
 }
 
+void HTMLMediaElement::setTextTrackKindUserPreferenceForAllMediaElements(Document* document)
+{
+    WeakMediaElementSet elements = documentToElementSetMap().get(document);
+    for (const auto& element: elements)

[fs, 2015/06/24 08:59:07]

Nit: space around ':'

[srivats, 2015/07/02 01:41:21]

Done.

+        element->automaticTrackSelectionForUpdatedUserPreference();
+}
+
+void HTMLMediaElement::automaticTrackSelectionForUpdatedUserPreference()

[philipj_slow, 2015/06/24 09:54:20]

Is it really necessary to act on the changed user preference immediately? It's
not required by the spec and seems to add some complexity that will almost never
be noticed.

[srivats, 2015/07/02 01:41:21]

It does seem a little buggy to not have the platform state affect the videos
immediately on Android. Without this, the state change takes effect only on a
page refresh.

[philipj_slow, 2015/07/09 15:20:49]

Do native video players take the setting into account immediately when it's
changed?

[srivats, 2015/07/09 21:25:37]

I know that WebKit's native video player reacts to it a similar way. So the
settings take effect immediately on Safari and Chrome on iOS and Safari on Mac.
Unfortunately none of the other browsers support the platform caption settings
yet.

[philipj_slow, 2015/07/09 22:36:26]

OK, fair enough.

+{
+    markCaptionAndSubtitleTracksAsUnconfigured();
+    m_processingPreferenceChange = true;
+    m_closedCaptionsVisible = false;
+    honorUserPreferencesForAutomaticTextTrackSelection();
+    m_processingPreferenceChange = false;
+
+    // If a track is set to showing post performing automatic track selection,

[fs, 2015/06/24 08:59:07]

Nit: showing -> 'showing'

[srivats, 2015/07/02 01:41:20]

Done.

+    // set closed captions state to visible to update the CC button and display the track.
+    m_closedCaptionsVisible = m_textTracks->hasShowingTracks();
+    updateTextTrackDisplay();
+}
+
 void HTMLMediaElement::markCaptionAndSubtitleTracksAsUnconfigured()
 {
     if (!m_textTracks)
         return;
 
     // Mark all tracks as not "configured" so that
     // honorUserPreferencesForAutomaticTextTrackSelection() 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
@@ skipping 99 matching lines @@
 }
 
 void HTMLMediaElement::configureTextTrackDisplay(VisibilityChangeAssumption assumption)
 {
     ASSERT(m_textTracks);
     WTF_LOG(Media, "HTMLMediaElement::configureTextTrackDisplay(%p)", this);
 
     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;
-        }
-    }
+    bool haveVisibleTextTrack = m_textTracks->hasShowingTracks();
 
     if (assumption == AssumeNoVisibleChange
         && m_haveVisibleTextTrack == haveVisibleTextTrack) {
         cueTimeline().updateActiveCues(currentTime());
         return;
     }
     m_haveVisibleTextTrack = haveVisibleTextTrack;
     m_closedCaptionsVisible = m_haveVisibleTextTrack;
 
     if (!m_haveVisibleTextTrack && !mediaControls())
@@ skipping 263 matching lines @@
 
 #if ENABLE(WEB_AUDIO)
 void HTMLMediaElement::clearWeakMembers(Visitor* visitor)
 {
     if (!Heap::isHeapObjectAlive(m_audioSourceNode) && audioSourceProvider())
         audioSourceProvider()->setClient(nullptr);
 }
 #endif
 
 }