third_party/WebKit/Source/web/FrameLoaderClientImpl.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/web/FrameLoaderClientImpl.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/Source/platform/exported/WebMediaPlayerSource.cpp ('K') | « third_party/WebKit/Source/platform/exported/WebMediaPlayerSource.cpp ('k') | third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/web/FrameLoaderClientImpl.h

diff --git a/third_party/WebKit/Source/web/FrameLoaderClientImpl.h b/third_party/WebKit/Source/web/FrameLoaderClientImpl.h

index 60f3c2662d968b3f0e5cf7d7af107a9fd94b8cf5..4817b5fc636e26f692925a13932b7e6071620b9a 100644

--- a/third_party/WebKit/Source/web/FrameLoaderClientImpl.h

+++ b/third_party/WebKit/Source/web/FrameLoaderClientImpl.h

@@ -129,7 +129,7 @@ public:

HTMLPlugInElement*, const KURL&,

const Vector<WTF::String>&, const Vector<WTF::String>&,

const WTF::String&, bool loadManually, DetachedPluginPolicy) override;

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

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

PassOwnPtr<WebMediaSession> createWebMediaSession() override;

ObjectContentType getObjectContentType(

const KURL&, const WTF::String& mimeType, bool shouldPreferPlugInsForImages) override;