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

Index: third_party/WebKit/Source/modules/mediasource/MediaSource.cpp

diff --git a/third_party/WebKit/Source/modules/mediasource/MediaSource.cpp b/third_party/WebKit/Source/modules/mediasource/MediaSource.cpp

index 6db94574f2e9aedf91a647868bce57c431664536..95e0a344230016fe46aebfe142e79fb0c0d95b25 100644

--- a/third_party/WebKit/Source/modules/mediasource/MediaSource.cpp

+++ b/third_party/WebKit/Source/modules/mediasource/MediaSource.cpp

@@ -97,8 +97,8 @@ MediaSource::MediaSource(ExecutionContext* context)

, m_readyState(closedKeyword())

, m_asyncEventQueue(GenericEventQueue::create(this))

, m_attachedElement(nullptr)

- , m_sourceBuffers(SourceBufferList::create(executionContext(), m_asyncEventQueue.get()))

- , m_activeSourceBuffers(SourceBufferList::create(executionContext(), m_asyncEventQueue.get()))

+ , m_sourceBuffers(SourceBufferList::create(getExecutionContext(), m_asyncEventQueue.get()))

+ , m_activeSourceBuffers(SourceBufferList::create(getExecutionContext(), m_asyncEventQueue.get()))

, m_isAddedToRegistry(false)

{

WTF_LOG(Media, "MediaSource::MediaSource %p", this);

@@ -270,9 +270,9 @@ const AtomicString& MediaSource::interfaceName() const

return EventTargetNames::MediaSource;

}

-ExecutionContext* MediaSource::executionContext() const

+ExecutionContext* MediaSource::getExecutionContext() const

{

- return ActiveDOMObject::executionContext();

+ return ActiveDOMObject::getExecutionContext();

}

DEFINE_TRACE(MediaSource)