| Index: third_party/WebKit/Source/core/html/HTMLMediaElement.h
|
| diff --git a/third_party/WebKit/Source/core/html/HTMLMediaElement.h b/third_party/WebKit/Source/core/html/HTMLMediaElement.h
|
| index da7f4f964d31edb2ff6577cfcd584b3dab5c53e9..a8f5f25ff6954acb6de59f5c2a2144e7e34ee55a 100644
|
| --- a/third_party/WebKit/Source/core/html/HTMLMediaElement.h
|
| +++ b/third_party/WebKit/Source/core/html/HTMLMediaElement.h
|
| @@ -203,6 +203,7 @@ public:
|
| void textTrackReadyStateChanged(TextTrack*);
|
|
|
| void textTrackModeChanged(TextTrack*);
|
| + void disableAutomaticTextTrackSelection();
|
|
|
| // EventTarget function.
|
| // Both Node (via HTMLElement) and ActiveDOMObject define this method, which
|
| @@ -219,8 +220,7 @@ public:
|
| virtual bool usesOverlayFullscreenVideo() const { return false; }
|
|
|
| bool hasClosedCaptions() const;
|
| - bool closedCaptionsVisible() const;
|
| - void setClosedCaptionsVisible(bool);
|
| + bool textTracksVisible() const;
|
|
|
| static void setTextTrackKindUserPreferenceForAllMediaElements(Document*);
|
| void automaticTrackSelectionForUpdatedUserPreference();
|
| @@ -557,9 +557,11 @@ private:
|
| // time has not changed since sending an "ended" event
|
| bool m_sentEndEvent : 1;
|
|
|
| - bool m_closedCaptionsVisible : 1;
|
| -
|
| bool m_ignorePreloadNone : 1;
|
| +
|
| + bool m_textTracksVisible : 1;
|
| + bool m_shouldPerformAutomaticTrackSelection : 1;
|
| +
|
| bool m_tracksAreReady : 1;
|
| bool m_processingPreferenceChange : 1;
|
| bool m_remoteRoutesAvailable : 1;
|
|
|