Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(77)

Unified Diff: third_party/WebKit/Source/core/html/HTMLMediaElement.h

Issue 1815033003: Add srcObject attribute of type MediaStream to HTMLMediaElement. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: haraken's comments + extra test Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 2a0ec2e9f3a4f7dae2749d73f9c5738d08013f5e..51d0993488d4985c9d8cc5b03f2c0f6c4fcf69ba 100644
--- a/third_party/WebKit/Source/core/html/HTMLMediaElement.h
+++ b/third_party/WebKit/Source/core/html/HTMLMediaElement.h
@@ -108,6 +108,7 @@ public:
// network state
void setSrc(const AtomicString&);
const KURL& currentSrc() const { return m_currentSrc; }
+ void setSrcObjectURL(const AtomicString&);
philipj_slow 2016/03/21 11:13:13 Rather than using an object URL, can you look into
Guido Urdaneta 2016/03/21 16:34:53 Source/platform and public/platform cannot access
philipj_slow 2016/03/22 16:06:54 Just judging by include rules, maybe public/web/We
Guido Urdaneta 2016/03/24 14:38:44 I went for the URL+srcObject approach. I called th
enum NetworkState { NETWORK_EMPTY, NETWORK_IDLE, NETWORK_LOADING, NETWORK_NO_SOURCE };
NetworkState getNetworkState() const;
@@ -355,6 +356,9 @@ private:
void setPlayerPreload();
WebMediaPlayer::LoadType loadType() const;
void scheduleNextSourceChild();
+ void loadSourceFromObject();
+ void loadSourceFromAttribute();
+ void loadSourceFromURL(const AtomicString&);
void loadNextSourceChild();
void clearMediaPlayer();
void clearMediaPlayerAndAudioSourceProviderClientWithoutLocking();
@@ -499,10 +503,11 @@ 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;
+ AtomicString m_srcObjectURL;
// "Deferred loading" state (for preload=none).
enum DeferredLoadState {

Powered by Google App Engine
This is Rietveld 408576698