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 condition 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

« third_party/WebKit/Source/modules/srcobject/HTMLMediaElementSrcObject.cpp ('K') | « third_party/WebKit/Source/platform/exported/WebMediaElementSource.cpp ('k') | third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp » ('j') | third_party/WebKit/public/platform/WebMediaElementSource.h » ('J')
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 381ae74cb36015eb187a27d3e798ee532244dc72..0fe92c82313369cfeaaf51e54e2b1c1abdeded6f 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 WebMediaElementSource&, WebMediaPlayerClient*) override;

PassOwnPtr<WebMediaSession> createWebMediaSession() override;

ObjectContentType getObjectContentType(

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