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 05c1fcd9f311778302f33b28076ea5108a3872b1..61901051efce0aa41c2677ce677f347ddaba14ec 100644 |
| --- a/third_party/WebKit/Source/core/html/HTMLMediaElement.h |
| +++ b/third_party/WebKit/Source/core/html/HTMLMediaElement.h |
| @@ -38,6 +38,7 @@ |
| #include "platform/Supplementable.h" |
| #include "platform/audio/AudioSourceProvider.h" |
| #include "public/platform/WebAudioSourceProviderClient.h" |
| +#include "public/platform/WebMediaElementSource.h" |
| #include "public/platform/WebMediaPlayerClient.h" |
| #include "public/platform/WebMimeRegistry.h" |
| @@ -110,6 +111,7 @@ public: |
| // network state |
| void setSrc(const AtomicString&); |
| const KURL& currentSrc() const { return m_currentSrc; } |
| + void setSrcObject(const WebMediaElementSource&); |
| enum NetworkState { NETWORK_EMPTY, NETWORK_IDLE, NETWORK_LOADING, NETWORK_NO_SOURCE }; |
| NetworkState getNetworkState() const; |
| @@ -355,11 +357,13 @@ private: |
| void invokeResourceSelectionAlgorithm(); |
| void loadInternal(); |
| void selectMediaResource(); |
| - void loadResource(const KURL&, ContentType&); |
| + void loadResource(ContentType&); |
|
philipj_slow
2016/03/29 13:43:19
Can loadResource still take the thing to load as a
Guido Urdaneta
2016/03/29 14:48:11
The thing to load is now stored in the m_source me
|
| void startPlayerLoad(); |
| void setPlayerPreload(); |
| WebMediaPlayer::LoadType loadType() const; |
| void scheduleNextSourceChild(); |
| + void loadSourceFromObject(); |
| + void loadSourceFromAttribute(); |
| void loadNextSourceChild(); |
| void clearMediaPlayer(); |
| void clearMediaPlayerAndAudioSourceProviderClientWithoutLocking(); |
| @@ -483,6 +487,7 @@ private: |
| ReadyState m_readyState; |
| ReadyState m_readyStateMaximum; |
| KURL m_currentSrc; |
| + WebMediaElementSource m_source; |
| PersistentWillBeMember<MediaError> m_error; |
| @@ -504,7 +509,7 @@ private: |
| double m_defaultPlaybackStartPosition; |
| // Loading state. |
| - enum LoadState { WaitingForSource, LoadingFromSrcAttr, LoadingFromSourceElement }; |
| + enum LoadState { WaitingForSource, LoadingFromSrcObject, LoadingFromSrcAttr, LoadingFromSourceElement }; |
| LoadState m_loadState; |
| RefPtrWillBeMember<HTMLSourceElement> m_currentSourceNode; |
| RefPtrWillBeMember<Node> m_nextChildNodeToConsider; |