third_party/WebKit/Source/core/loader/FrameLoaderClient.h - Issue 1815033003: Add srcObject attribute of type MediaStream to HTMLMediaElement.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/core/loader/FrameLoaderClient.h

Issue 1815033003: Add srcObject attribute of type MediaStream to HTMLMediaElement. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix android and tests Created 4 years, 8 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

« third_party/WebKit/LayoutTests/media/video-srcobject-mediastream-src-file.html ('K') | « third_party/WebKit/Source/core/loader/EmptyClients.cpp ('k') | third_party/WebKit/Source/modules/mediastream/MediaStream.h » ('j') | third_party/WebKit/Source/platform/exported/WebMediaPlayerSource.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/loader/FrameLoaderClient.h

diff --git a/third_party/WebKit/Source/core/loader/FrameLoaderClient.h b/third_party/WebKit/Source/core/loader/FrameLoaderClient.h

index 6bbba1018c8506ff55a787c4cdf0e48adba4abf7..220c96e0f1eb23fc6e20d5cbe11e47fd622da499 100644

--- a/third_party/WebKit/Source/core/loader/FrameLoaderClient.h

+++ b/third_party/WebKit/Source/core/loader/FrameLoaderClient.h

@@ -69,7 +69,9 @@ class WebApplicationCacheHostClient;

class WebCookieJar;

class WebMediaPlayer;

class WebMediaPlayerClient;

+class WebMediaPlayerSource;

class WebMediaSession;

+class WebMediaStream;

class WebRTCPeerConnectionHandler;

class WebServiceWorkerProvider;

class WebSocketHandle;

@@ -161,7 +163,7 @@ public:

virtual bool canCreatePluginWithoutRenderer(const String& mimeType) const = 0;

virtual Widget* createPlugin(HTMLPlugInElement*, const KURL&, const Vector<String>&, const Vector<String>&, const String&, bool loadManually, DetachedPluginPolicy) = 0;

- virtual PassOwnPtr<WebMediaPlayer> createWebMediaPlayer(HTMLMediaElement&, const WebURL&, WebMediaPlayerClient*) = 0;

+ virtual PassOwnPtr<WebMediaPlayer> createWebMediaPlayer(HTMLMediaElement&, const WebMediaPlayerSource&, WebMediaPlayerClient*) = 0;

virtual PassOwnPtr<WebMediaSession> createWebMediaSession() = 0;