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

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

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

index 112d49387d54aa8b33939ef4291f7a2a00c87cce..20b61f0dd85197c0dd33d64b89bd3763dc7fe7ab 100644

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

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

@@ -42,7 +42,7 @@ MediaDevicesRequest* MediaDevicesRequest::create(ScriptState* state, UserMediaCo

}

MediaDevicesRequest::MediaDevicesRequest(ScriptState* state, UserMediaController* controller)

- : ActiveDOMObject(state->executionContext())

+ : ActiveDOMObject(state->getExecutionContext())

, m_controller(controller)

, m_resolver(ScriptPromiseResolver::create(state))

{

@@ -54,7 +54,7 @@ MediaDevicesRequest::~MediaDevicesRequest()

Document* MediaDevicesRequest::ownerDocument()

{

- if (ExecutionContext* context = executionContext()) {

+ if (ExecutionContext* context = getExecutionContext()) {

return toDocument(context);

}

@@ -71,7 +71,7 @@ ScriptPromise MediaDevicesRequest::start()

void MediaDevicesRequest::succeed(const MediaDeviceInfoVector& mediaDevices)

{

- if (!executionContext() || !m_resolver)

+ if (!getExecutionContext() || !m_resolver)

return;

m_resolver->resolve(mediaDevices);