third_party/WebKit/Source/platform/exported/WebMediaStreamSource.cpp - Issue 1774943003: blink: Rename platform/ methods 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/platform/exported/WebMediaStreamSource.cpp

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

Patch Set: clash-platform: rebase-yayyyyyyyy 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/platform/exported/WebMediaStream.cpp ('k') | third_party/WebKit/Source/platform/exported/WebMediaStreamTrack.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/exported/WebMediaStreamSource.cpp

diff --git a/third_party/WebKit/Source/platform/exported/WebMediaStreamSource.cpp b/third_party/WebKit/Source/platform/exported/WebMediaStreamSource.cpp

index fc2474fa939896896443d26c76c86c02e6b3a72e..d8001a89a43a192fe77a0efd9a321d10f3f89355 100644

--- a/third_party/WebKit/Source/platform/exported/WebMediaStreamSource.cpp

+++ b/third_party/WebKit/Source/platform/exported/WebMediaStreamSource.cpp

@@ -47,7 +47,7 @@ class ExtraDataContainer : public MediaStreamSource::ExtraData {

public:

ExtraDataContainer(PassOwnPtr<WebMediaStreamSource::ExtraData> extraData) : m_extraData(std::move(extraData)) { }

- WebMediaStreamSource::ExtraData* extraData() { return m_extraData.get(); }

+ WebMediaStreamSource::ExtraData* getExtraData() { return m_extraData.get(); }

private:

OwnPtr<WebMediaStreamSource::ExtraData> m_extraData;

@@ -142,10 +142,10 @@ WebMediaStreamSource::ReadyState WebMediaStreamSource::getReadyState() const

WebMediaStreamSource::ExtraData* WebMediaStreamSource::getExtraData() const

{

ASSERT(!m_private.isNull());

- MediaStreamSource::ExtraData* data = m_private->extraData();

+ MediaStreamSource::ExtraData* data = m_private->getExtraData();

if (!data)

return 0;

- return static_cast<ExtraDataContainer*>(data)->extraData();

+ return static_cast<ExtraDataContainer*>(data)->getExtraData();

}

void WebMediaStreamSource::setExtraData(ExtraData* extraData)