content/renderer/media/rtc_peer_connection_handler.cc - 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: content/renderer/media/rtc_peer_connection_handler.cc

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 | « content/renderer/media/media_stream_video_track.cc ('k') | content/renderer/media/speech_recognition_audio_sink_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/media/rtc_peer_connection_handler.cc

diff --git a/content/renderer/media/rtc_peer_connection_handler.cc b/content/renderer/media/rtc_peer_connection_handler.cc

index 10c6c047f19ba15183c5d5ec17e9f265e90cfa73..3b315d2a584dd4746ba5c9a4dceae13b6e4cf51a 100644

--- a/content/renderer/media/rtc_peer_connection_handler.cc

+++ b/content/renderer/media/rtc_peer_connection_handler.cc

@@ -768,7 +768,7 @@ class RTCPeerConnectionHandler::Observer

}

void OnAddStreamImpl(scoped_ptr<RemoteMediaStreamImpl> stream) {

- DCHECK(stream->webkit_stream().extraData()) << "Initialization not done";

+ DCHECK(stream->webkit_stream().getExtraData()) << "Initialization not done";

if (handler_)

handler_->OnAddStream(std::move(stream));

}

@@ -1498,7 +1498,7 @@ void RTCPeerConnectionHandler::OnAddStream(

DCHECK(thread_checker_.CalledOnValidThread());

DCHECK(remote_streams_.find(stream->webrtc_stream().get()) ==

remote_streams_.end());

- DCHECK(stream->webkit_stream().extraData()) << "Initialization not done";

+ DCHECK(stream->webkit_stream().getExtraData()) << "Initialization not done";

TRACE_EVENT0("webrtc", "RTCPeerConnectionHandler::OnAddStreamImpl");

// Ownership is with remote_streams_ now.