third_party/WebKit/Source/modules/mediastream/MediaDevices.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/mediastream/MediaDevices.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/mediasource/SourceBufferList.cpp ('k') | third_party/WebKit/Source/modules/mediastream/MediaDevicesRequest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/modules/mediastream/MediaDevices.cpp

diff --git a/third_party/WebKit/Source/modules/mediastream/MediaDevices.cpp b/third_party/WebKit/Source/modules/mediastream/MediaDevices.cpp

index 20320d38518207a914317a4bdbfac05808979002..556ec89dfc668e4869aee20d95e060673f2bbe7f 100644

--- a/third_party/WebKit/Source/modules/mediastream/MediaDevices.cpp

+++ b/third_party/WebKit/Source/modules/mediastream/MediaDevices.cpp

@@ -22,7 +22,7 @@ namespace blink {

ScriptPromise MediaDevices::enumerateDevices(ScriptState* scriptState)

{

- Document* document = toDocument(scriptState->executionContext());

+ Document* document = toDocument(scriptState->getExecutionContext());

UserMediaController* userMedia = UserMediaController::from(document->frame());

if (!userMedia)

return ScriptPromise::rejectWithDOMException(scriptState, DOMException::create(NotSupportedError, "No media device controller available; is this a detached window?"));

@@ -94,7 +94,7 @@ ScriptPromise MediaDevices::getUserMedia(ScriptState* scriptState, const MediaSt

NavigatorUserMediaSuccessCallback* successCallback = new PromiseSuccessCallback(resolver);

NavigatorUserMediaErrorCallback* errorCallback = new PromiseErrorCallback(resolver);

- Document* document = toDocument(scriptState->executionContext());

+ Document* document = toDocument(scriptState->getExecutionContext());

UserMediaController* userMedia = UserMediaController::from(document->frame());

if (!userMedia)

return ScriptPromise::rejectWithDOMException(scriptState, DOMException::create(NotSupportedError, "No media device controller available; is this a detached window?"));