third_party/WebKit/Source/platform/exported/WebMediaStreamSource.cpp - Issue 1746283002: Rename enums/functions that collide in chromium style in platform/

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 1746283002: Rename enums/functions that collide in chromium style in platform/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: get-names-13-platform: . Created 4 years, 10 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/audio/Panner.h ('k') | third_party/WebKit/Source/platform/exported/WebScrollbarImpl.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 d3a042180bd570570c46db49ef0741aafc689c96..35c9e22d6c144b7a4c56af2bbf087f6fb9c120dc 100644

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

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

@@ -95,12 +95,12 @@ WebMediaStreamSource::operator MediaStreamSource*() const

void WebMediaStreamSource::initialize(const WebString& id, Type type, const WebString& name)

{

- m_private = MediaStreamSource::create(id, static_cast<MediaStreamSource::Type>(type), name, false, true);

+ m_private = MediaStreamSource::create(id, static_cast<MediaStreamSource::StreamType>(type), name, false, true);

}

void WebMediaStreamSource::initialize(const WebString& id, Type type, const WebString& name, bool remote, bool readonly)

{

- m_private = MediaStreamSource::create(id, static_cast<MediaStreamSource::Type>(type), name, remote, readonly);

+ m_private = MediaStreamSource::create(id, static_cast<MediaStreamSource::StreamType>(type), name, remote, readonly);

}

WebString WebMediaStreamSource::id() const

@@ -136,7 +136,7 @@ void WebMediaStreamSource::setReadyState(ReadyState state)

WebMediaStreamSource::ReadyState WebMediaStreamSource::readyState() const

{

ASSERT(!m_private.isNull());

- return static_cast<ReadyState>(m_private->readyState());

+ return static_cast<ReadyState>(m_private->getReadyState());

}

WebMediaStreamSource::ExtraData* WebMediaStreamSource::extraData() const