Chromium Code Reviews| 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 d922e17663329c83ae765be9562ac9d3e29f053c..a21134dd83f13fa6c05e56b46e41725367c0d322 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&); |
| @@ -361,7 +363,6 @@ private: |
| void mediaEngineError(MediaError*); |
| void cancelPendingEventsAndCallbacks(); |
| void waitForSourceChange(); |
| - void prepareToPlay(); |
| KURL selectNextSourceChild(ContentType*, InvalidURLAction); |
| @@ -552,8 +553,7 @@ private: |
| bool m_closedCaptionsVisible : 1; |
| - bool m_havePreparedToPlay : 1; |
| - |
| + bool m_ignorePreloadNone : 1; |
|
philipj_slow
2016/03/09 09:16:00
m_forceEffectivePreloadAuto might be a more descri
Srirama
2016/03/09 12:26:22
Done.
|
| bool m_tracksAreReady : 1; |
| bool m_processingPreferenceChange : 1; |
| bool m_remoteRoutesAvailable : 1; |