Index: Source/core/html/HTMLMediaElement.cpp |
diff --git a/Source/core/html/HTMLMediaElement.cpp b/Source/core/html/HTMLMediaElement.cpp |
index 0136464ef89e731646dcb0d6fced717c57badea3..9907360a470f5036452b6a14cc9d1dba1d5ef039 100644 |
--- a/Source/core/html/HTMLMediaElement.cpp |
+++ b/Source/core/html/HTMLMediaElement.cpp |
@@ -1145,7 +1145,7 @@ void HTMLMediaElement::textTrackModeChanged(TextTrack* track) |
if (track->trackType() == TextTrack::TrackElement) |
track->setHasBeenConfigured(true); |
- configureTextTrackDisplay(AssumeVisibleChange); |
+ configureTextTrackDisplay(); |
ASSERT(textTracks()->contains(track)); |
textTracks()->scheduleChangeEvent(); |
@@ -3072,9 +3072,6 @@ void HTMLMediaElement::clearMediaPlayer(int flags) |
if (mediaControls()) |
mediaControls()->refreshCastButtonVisibility(); |
- if (m_textTracks) |
- configureTextTrackDisplay(AssumeNoVisibleChange); |
- |
if (layoutObject()) |
layoutObject()->setShouldDoFullPaintInvalidation(); |
} |
@@ -3420,7 +3417,7 @@ CueTimeline& HTMLMediaElement::cueTimeline() |
return *m_cueTimeline; |
} |
-void HTMLMediaElement::configureTextTrackDisplay(VisibilityChangeAssumption assumption) |
+void HTMLMediaElement::configureTextTrackDisplay() |
{ |
ASSERT(m_textTracks); |
WTF_LOG(Media, "HTMLMediaElement::configureTextTrackDisplay(%p)", this); |
@@ -3428,14 +3425,7 @@ void HTMLMediaElement::configureTextTrackDisplay(VisibilityChangeAssumption assu |
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()) |