| 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 3fb86a680545508e154d00ef3cf7b6ebec743b27..dd2c39bcbcf84c9d3ebe6f952bed22cadf22e358 100644
|
| --- a/third_party/WebKit/Source/core/html/HTMLMediaElement.h
|
| +++ b/third_party/WebKit/Source/core/html/HTMLMediaElement.h
|
| @@ -97,7 +97,7 @@ public:
|
| LoadTextTrackResource = 1 << 1,
|
| TextTrackChangesNotification = 1 << 2
|
| };
|
| - void scheduleDelayedAction(DelayedActionType);
|
| + void scheduleTextTrackResourceLoad();
|
|
|
| bool hasRemoteRoutes() const { return m_remoteRoutesAvailable; }
|
| bool isPlayingRemotely() const { return m_playingRemotely; }
|
| @@ -348,6 +348,7 @@ private:
|
|
|
| // loading
|
| void prepareForLoad();
|
| + void invokeResourceSelectionAlgorithm();
|
| void loadInternal();
|
| void selectMediaResource();
|
| void loadResource(const KURL&, ContentType&, const String& keySystem);
|
| @@ -356,7 +357,7 @@ private:
|
| WebMediaPlayer::LoadType loadType() const;
|
| void scheduleNextSourceChild();
|
| void loadNextSourceChild();
|
| - void clearMediaPlayer(int flags);
|
| + void resetMediaElement(int flags);
|
| void clearMediaPlayerAndAudioSourceProviderClientWithoutLocking();
|
| bool havePotentialSourceChild();
|
| void noneSupported();
|
|
|