Stop calling configureTextTrackDisplay() in clearMediaPlayer()

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 1127 matching lines @@
             mediaControls()->refreshClosedCaptionsButtonVisibility();
     }
 }
 
 void HTMLMediaElement::textTrackModeChanged(TextTrack* track)
 {
     // Mark this track as "configured" so configureTextTracks won't change the mode again.
     if (track->trackType() == TextTrack::TrackElement)
         track->setHasBeenConfigured(true);
 
-    configureTextTrackDisplay(AssumeVisibleChange);
+    configureTextTrackDisplay();
 
     ASSERT(textTracks()->contains(track));
     textTracks()->scheduleChangeEvent();
 }
 
 bool HTMLMediaElement::isSafeToLoadURL(const KURL& url, InvalidURLAction actionIfInvalid)
 {
     if (!url.isValid()) {
         WTF_LOG(Media, "HTMLMediaElement::isSafeToLoadURL(%p, %s) -> FALSE because url is invalid", this, urlForLoggingMedia(url).utf8().data());
         return false;
@@ skipping 1906 matching lines @@
 
     m_pendingActionFlags &= ~flags;
     m_loadState = WaitingForSource;
 
     // We can't cast if we don't have a media player.
     m_remoteRoutesAvailable = false;
     m_playingRemotely = false;
     if (mediaControls())
         mediaControls()->refreshCastButtonVisibility();
 
-    if (m_textTracks)
-        configureTextTrackDisplay(AssumeNoVisibleChange);
-
     if (layoutObject())
         layoutObject()->setShouldDoFullPaintInvalidation();
 }
 
 void HTMLMediaElement::stop()
 {
     WTF_LOG(Media, "HTMLMediaElement::stop(%p)", this);
 
     if (m_playing && m_initialPlayWithoutUserGestures)
         gesturelessInitialPlayHalted();
@@ skipping 325 matching lines @@
         mediaControls()->hide();
 }
 
 CueTimeline& HTMLMediaElement::cueTimeline()
 {
     if (!m_cueTimeline)
         m_cueTimeline = adoptPtrWillBeNoop(new CueTimeline(*this));
     return *m_cueTimeline;
 }
 
-void HTMLMediaElement::configureTextTrackDisplay(VisibilityChangeAssumption assumption)
+void HTMLMediaElement::configureTextTrackDisplay()
 {
     ASSERT(m_textTracks);
     WTF_LOG(Media, "HTMLMediaElement::configureTextTrackDisplay(%p)", this);
 
     if (m_processingPreferenceChange)
         return;
 
-    bool haveVisibleTextTrack = m_textTracks->hasShowingTracks();
-
-    if (assumption == AssumeNoVisibleChange
-        && m_haveVisibleTextTrack == haveVisibleTextTrack) {
-        cueTimeline().updateActiveCues(currentTime());
-        return;
-    }
-    m_haveVisibleTextTrack = haveVisibleTextTrack;
+    m_haveVisibleTextTrack = m_textTracks->hasShowingTracks();
     m_closedCaptionsVisible = m_haveVisibleTextTrack;
 
     if (!m_haveVisibleTextTrack && !mediaControls())
         return;
 
     if (mediaControls())
         mediaControls()->changedClosedCaptionsVisibility();
 
     cueTimeline().updateActiveCues(currentTime());
 
@@ skipping 256 matching lines @@
 
 #if ENABLE(WEB_AUDIO)
 void HTMLMediaElement::clearWeakMembers(Visitor* visitor)
 {
     if (!Heap::isHeapObjectAlive(m_audioSourceNode) && audioSourceProvider())
         audioSourceProvider()->setClient(nullptr);
 }
 #endif
 
 }