| Index: Source/core/html/HTMLMediaElement.cpp
|
| diff --git a/Source/core/html/HTMLMediaElement.cpp b/Source/core/html/HTMLMediaElement.cpp
|
| index 91ef6708e6f5e78594ef9b36ad751aec9955cc39..f7398d2789c4943288534ed650df6c38ca487414 100644
|
| --- a/Source/core/html/HTMLMediaElement.cpp
|
| +++ b/Source/core/html/HTMLMediaElement.cpp
|
| @@ -2612,17 +2612,17 @@ void HTMLMediaElement::mediaPlayerDidRemoveTextTrack(WebInbandTextTrack* webTrac
|
| removeTextTrack(textTrack.get());
|
| }
|
|
|
| -void HTMLMediaElement::closeCaptionTracksChanged()
|
| +void HTMLMediaElement::textTracksChanged()
|
| {
|
| if (hasMediaControls())
|
| - mediaControls()->closedCaptionTracksChanged();
|
| + mediaControls()->textTracksChanged();
|
| }
|
|
|
| void HTMLMediaElement::addTextTrack(TextTrack* track)
|
| {
|
| textTracks()->append(track);
|
|
|
| - closeCaptionTracksChanged();
|
| + textTracksChanged();
|
| }
|
|
|
| void HTMLMediaElement::removeTextTrack(TextTrack* track)
|
| @@ -2630,7 +2630,7 @@ void HTMLMediaElement::removeTextTrack(TextTrack* track)
|
| TrackDisplayUpdateScope scope(this);
|
| m_textTracks->remove(track);
|
|
|
| - closeCaptionTracksChanged();
|
| + textTracksChanged();
|
| }
|
|
|
| void HTMLMediaElement::forgetResourceSpecificTracks()
|
| @@ -2641,7 +2641,7 @@ void HTMLMediaElement::forgetResourceSpecificTracks()
|
| if (m_textTracks) {
|
| TrackDisplayUpdateScope scope(this);
|
| m_textTracks->removeAllInbandTracks();
|
| - closeCaptionTracksChanged();
|
| + textTracksChanged();
|
| }
|
|
|
| m_audioTracks->removeAll();
|
| @@ -2708,9 +2708,6 @@ void HTMLMediaElement::didAddTrackElement(HTMLTrackElement* trackElement)
|
| // in the markup have been added.
|
| if (isFinishedParsingChildren())
|
| scheduleDelayedAction(LoadTextTrackResource);
|
| -
|
| - if (hasMediaControls())
|
| - mediaControls()->closedCaptionTracksChanged();
|
| }
|
|
|
| void HTMLMediaElement::didRemoveTrackElement(HTMLTrackElement* trackElement)
|
| @@ -2889,8 +2886,7 @@ void HTMLMediaElement::configureTextTracks()
|
| if (otherTracks.tracks.size())
|
| configureTextTrackGroup(otherTracks);
|
|
|
| - if (hasMediaControls())
|
| - mediaControls()->closedCaptionTracksChanged();
|
| + textTracksChanged();
|
| }
|
|
|
| bool HTMLMediaElement::havePotentialSourceChild()
|
|
|