Media Controls: Use events to update controls for closed captions.

third_party/WebKit/Source/core/html/shadow/MediaControls.cpp

 /*
  * Copyright (C) 2011, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2011, 2012 Google 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
@@ skipping 321 matching lines @@
     mediaElement().pause();
 
   updatePlayState();
 
   updateCurrentTimeDisplay();
 
   m_timeline->setDuration(duration);
   m_timeline->setPosition(mediaElement().currentTime());
 
   onVolumeChange();
-
-  refreshClosedCaptionsButtonVisibility();
+  onTextTracksAddedRemoved();
 
   m_fullscreenButton->setIsWanted(shouldShowFullscreenButton(mediaElement()));
 
   refreshCastButtonVisibilityWithoutUpdate();
 
   m_downloadButton->setIsWanted(
       m_downloadButton->shouldDisplayDownloadButton());
 }
 
 LayoutObject* MediaControls::layoutObjectForTextTrackLayout() {
@@ skipping 93 matching lines @@
   double now = mediaElement().currentTime();
   double duration = mediaElement().duration();
 
   // Allow the theme to format the time.
   m_currentTimeDisplay->setInnerText(
       LayoutTheme::theme().formatMediaControlsCurrentTime(now, duration),
       IGNORE_EXCEPTION);
   m_currentTimeDisplay->setCurrentValue(now);
 }
 
-void MediaControls::changedClosedCaptionsVisibility() {
-  m_toggleClosedCaptionsButton->updateDisplayType();
-}
-
-void MediaControls::refreshClosedCaptionsButtonVisibility() {
-  m_toggleClosedCaptionsButton->setIsWanted(mediaElement().hasClosedCaptions());
-  BatchedControlUpdate batch(this);
-}
-
 void MediaControls::toggleTextTrackList() {
   if (!mediaElement().hasClosedCaptions()) {
     m_textTrackList->setVisible(false);
     return;
   }
 
   if (!m_textTrackList->isWanted())
     m_windowEventListener->start();
 
   m_textTrackList->setVisible(!m_textTrackList->isWanted());
@@ skipping 241 matching lines @@
 
 void MediaControls::onPause() {
   updatePlayState();
   m_timeline->setPosition(mediaElement().currentTime());
   updateCurrentTimeDisplay();
   makeOpaque();
 
   stopHideMediaControlsTimer();
 }
 
+void MediaControls::onTextTracksAddedRemoved() {
+  m_toggleClosedCaptionsButton->setIsWanted(mediaElement().hasClosedCaptions());
+  BatchedControlUpdate batch(this);
+}
+
+void MediaControls::onTextTracksChanged() {
+  m_toggleClosedCaptionsButton->updateDisplayType();
+}
+
 void MediaControls::notifyPanelWidthChanged(const LayoutUnit& newWidth) {
   // Don't bother to do any work if this matches the most recent panel
   // width, since we're called after layout.
   // Note that this code permits a bad frame on resize, since it is
   // run after the relayout / paint happens.  It would be great to improve
   // this, but it would be even greater to move this code entirely to
   // JS and fix it there.
   m_panelWidth = newWidth.toInt();
 
   // Adjust for effective zoom.
@@ skipping 177 matching lines @@
   visitor->trace(m_overflowMenu);
   visitor->trace(m_overflowList);
   visitor->trace(m_castButton);
   visitor->trace(m_overlayCastButton);
   visitor->trace(m_mediaEventListener);
   visitor->trace(m_windowEventListener);
   HTMLDivElement::trace(visitor);
 }
 
 }  // namespace blink