third_party/WebKit/Source/modules/mediacapturefromelement/HTMLMediaElementCapture.cpp - Issue 1773813007: blink: Rename modules/ method to prefix with get when they collide.

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/modules/mediacapturefromelement/HTMLMediaElementCapture.cpp

Issue 1773813007: blink: Rename modules/ method to prefix with get when they collide. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: clash-modules: rebase-fixes 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

« no previous file with comments | « third_party/WebKit/Source/modules/mediacapturefromelement/HTMLCanvasElementCapture.cpp ('k') | third_party/WebKit/Source/modules/mediarecorder/MediaRecorder.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/modules/mediacapturefromelement/HTMLMediaElementCapture.cpp

diff --git a/third_party/WebKit/Source/modules/mediacapturefromelement/HTMLMediaElementCapture.cpp b/third_party/WebKit/Source/modules/mediacapturefromelement/HTMLMediaElementCapture.cpp

index 872c28ae2f2835abe4aa061709d3e94ecf7cd18c..5dcc08f3f015ebef314bbabebd35f719bc3dd41e 100644

--- a/third_party/WebKit/Source/modules/mediacapturefromelement/HTMLMediaElementCapture.cpp

+++ b/third_party/WebKit/Source/modules/mediacapturefromelement/HTMLMediaElementCapture.cpp

@@ -35,7 +35,7 @@ MediaStream* HTMLMediaElementCapture::captureStream(HTMLMediaElement& element, E

// If |element| is actually playing a MediaStream, just clone it.

if (HTMLMediaElement::isMediaStreamURL(element.currentSrc().getString())) {

- return MediaStream::create(element.executionContext(), MediaStreamRegistry::registry().lookupMediaStreamDescriptor(element.currentSrc().getString()));

+ return MediaStream::create(element.getExecutionContext(), MediaStreamRegistry::registry().lookupMediaStreamDescriptor(element.currentSrc().getString()));

}

// TODO(mcasas): Only <video> tags are supported at the moment.

@@ -49,7 +49,7 @@ MediaStream* HTMLMediaElementCapture::captureStream(HTMLMediaElement& element, E

MediaStreamCenter::instance().didCreateMediaStream(webStream);

Platform::current()->createHTMLVideoElementCapturer(&webStream, element.webMediaPlayer());

- return MediaStream::create(element.executionContext(), webStream);

+ return MediaStream::create(element.getExecutionContext(), webStream);

}

} // namespace blink