| Index: Source/core/html/HTMLMediaElement.cpp
|
| diff --git a/Source/core/html/HTMLMediaElement.cpp b/Source/core/html/HTMLMediaElement.cpp
|
| index da7853cfc18aaa7d90ea7b7a0f377d2759acf9dd..d82dda4f63e7e19653b7c09fc4b5672bb0cf1b31 100644
|
| --- a/Source/core/html/HTMLMediaElement.cpp
|
| +++ b/Source/core/html/HTMLMediaElement.cpp
|
| @@ -349,6 +349,7 @@ HTMLMediaElement::HTMLMediaElement(const QualifiedName& tagName, Document& docum
|
| , m_closedCaptionsVisible(false)
|
| , m_completelyLoaded(false)
|
| , m_havePreparedToPlay(false)
|
| + , m_didPerformAutomaticTrackSelection(false)
|
| , m_tracksAreReady(true)
|
| , m_haveVisibleTextTrack(false)
|
| , m_processingPreferenceChange(false)
|
| @@ -1167,6 +1168,11 @@ void HTMLMediaElement::textTrackModeChanged(TextTrack* track)
|
| textTracks()->scheduleChangeEvent();
|
| }
|
|
|
| +void HTMLMediaElement::disableAutomaticTextTrackSelection()
|
| +{
|
| + m_didPerformAutomaticTrackSelection = true;
|
| +}
|
| +
|
| bool HTMLMediaElement::isSafeToLoadURL(const KURL& url, InvalidURLAction actionIfInvalid)
|
| {
|
| if (!url.isValid()) {
|
| @@ -2481,6 +2487,9 @@ void HTMLMediaElement::honorUserPreferencesForAutomaticTextTrackSelection()
|
| if (!m_textTracks || !m_textTracks->length())
|
| return;
|
|
|
| + if (m_didPerformAutomaticTrackSelection)
|
| + return;
|
| +
|
| AutomaticTrackSelection::Configuration configuration;
|
| if (m_processingPreferenceChange)
|
| configuration.disableCurrentlyEnabledTracks = true;
|
|
|