third_party/WebKit/Source/platform/exported/WebMediaStream.cpp - Issue 1384233002: Reland: [Oilpan] Move MediaStream{Source|Component|Descriptor} to Oilpan heap

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/WebMediaStream.cpp

Issue 1384233002: Reland: [Oilpan] Move MediaStream{Source|Component|Descriptor} to Oilpan heap (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 2 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/webaudio/MediaStreamAudioDestinationNode.cpp ('k') | third_party/WebKit/Source/platform/exported/WebMediaStreamSource.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 7ead4c231ef1bd1044035f8ec08ee482abbcfdee..42f7fa33b192c67b309a9b1c02bc0656f455fdc8 100644

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

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

@@ -53,11 +53,6 @@ private:

} // namespace

-WebMediaStream::WebMediaStream(const PassRefPtr<MediaStreamDescriptor>& mediaStreamDescriptor)

- : m_private(mediaStreamDescriptor)

WebMediaStream::WebMediaStream(MediaStreamDescriptor* mediaStreamDescriptor)

: m_private(mediaStreamDescriptor)

{

@@ -116,17 +111,12 @@ void WebMediaStream::removeTrack(const WebMediaStreamTrack& track)

m_private->removeRemoteTrack(track);

}

-WebMediaStream& WebMediaStream::operator=(const PassRefPtr<MediaStreamDescriptor>& mediaStreamDescriptor)

+WebMediaStream& WebMediaStream::operator=(MediaStreamDescriptor* mediaStreamDescriptor)

{

m_private = mediaStreamDescriptor;

return *this;

}

-WebMediaStream::operator PassRefPtr<MediaStreamDescriptor>() const

- return m_private.get();

WebMediaStream::operator MediaStreamDescriptor*() const

{

return m_private.get();