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

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

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

index c5cafe3a8811467723cb1c9515b72e1a4ac07bf7..4ba60078a60d0ba0e1bbaa88a020190faee6d3c3 100644

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

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

@@ -312,9 +312,9 @@ const AtomicString& MediaStream::interfaceName() const

return EventTargetNames::MediaStream;

}

-ExecutionContext* MediaStream::executionContext() const

+ExecutionContext* MediaStream::getExecutionContext() const

{

- return ContextLifecycleObserver::executionContext();

+ return ContextLifecycleObserver::getExecutionContext();

}

void MediaStream::addRemoteTrack(MediaStreamComponent* component)

@@ -323,7 +323,7 @@ void MediaStream::addRemoteTrack(MediaStreamComponent* component)

if (m_stopped)

return;

- MediaStreamTrack* track = MediaStreamTrack::create(executionContext(), component);

+ MediaStreamTrack* track = MediaStreamTrack::create(getExecutionContext(), component);

switch (component->source()->type()) {

case MediaStreamSource::TypeAudio:

m_audioTracks.append(track);