| 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 5f22ef0d8d3ac51e6932f75e7a28498826335270..53876406c8c71dd0aaab0906f4a540a8c9cfdf75 100644
|
| --- a/third_party/WebKit/Source/core/html/HTMLMediaElement.h
|
| +++ b/third_party/WebKit/Source/core/html/HTMLMediaElement.h
|
| @@ -97,7 +97,7 @@ public:
|
| LoadMediaResource = 1 << 0,
|
| LoadTextTrackResource = 1 << 1
|
| };
|
| - void scheduleDelayedAction(DelayedActionType);
|
| + void scheduleTextTrackResourceLoad();
|
|
|
| bool hasRemoteRoutes() const { return m_remoteRoutesAvailable; }
|
| bool isPlayingRemotely() const { return m_playingRemotely; }
|
| @@ -345,7 +345,9 @@ private:
|
| void scheduleEvent(const AtomicString& eventName); // FIXME: Rename to scheduleNamedEvent for clarity.
|
|
|
| // loading
|
| + void invokeLoadAlgorithm();
|
| void prepareForLoad();
|
| + void invokeResourceSelectionAlgorithm();
|
| void loadInternal();
|
| void selectMediaResource();
|
| void loadResource(const KURL&, ContentType&);
|
| @@ -552,8 +554,7 @@ private:
|
|
|
| bool m_closedCaptionsVisible : 1;
|
|
|
| - bool m_havePreparedToPlay : 1;
|
| -
|
| + bool m_forceEffectivePreloadAuto : 1;
|
| bool m_tracksAreReady : 1;
|
| bool m_processingPreferenceChange : 1;
|
| bool m_remoteRoutesAvailable : 1;
|
|
|