third_party/WebKit/Source/core/html/HTMLVideoElementTest.cpp - 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/html/HTMLVideoElementTest.cpp

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/html/HTMLMediaElement.cpp ('k') | third_party/WebKit/Source/core/loader/EmptyClients.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/html/HTMLVideoElementTest.cpp

diff --git a/third_party/WebKit/Source/core/html/HTMLVideoElementTest.cpp b/third_party/WebKit/Source/core/html/HTMLVideoElementTest.cpp

index 661a2cc79207cf3e0bf6a2cb38cf383db972a1c0..b3bd917a7558e3023b6601d8764626160f1faa6f 100644

--- a/third_party/WebKit/Source/core/html/HTMLVideoElementTest.cpp

+++ b/third_party/WebKit/Source/core/html/HTMLVideoElementTest.cpp

@@ -21,7 +21,7 @@ namespace {

class EmptyWebMediaPlayer : public WebMediaPlayer {

public:

- void load(LoadType, const WebURL&, CORSMode) override { };

+ void load(LoadType, const WebMediaPlayerSource&, CORSMode) override { };

void play() override { };

void pause() override { };

bool supportsSave() const override { return false; };

@@ -63,7 +63,7 @@ public:

return new StubFrameLoaderClient;

}

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

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

{

return adoptPtr(new MockWebMediaPlayer);

}