third_party/WebKit/Source/platform/exported/WebMediaStreamSource.cpp - Issue 1375773004: Revert of [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/WebMediaStreamSource.cpp

Issue 1375773004: Revert of [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/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 79fe106d4cc4fdb391923340f4a864a79abb02d2..3041a57e77d18be8c844c029f8fca2f11f0223a4 100644

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

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

@@ -69,7 +69,7 @@

m_owner = owner;

}

-WebMediaStreamSource::WebMediaStreamSource(MediaStreamSource* mediaStreamSource)

+WebMediaStreamSource::WebMediaStreamSource(const PassRefPtr<MediaStreamSource>& mediaStreamSource)

: m_private(mediaStreamSource)

{

}

@@ -88,6 +88,11 @@

void WebMediaStreamSource::reset()

{

m_private.reset();

+WebMediaStreamSource::operator PassRefPtr<MediaStreamSource>() const

+ return m_private.get();

}

WebMediaStreamSource::operator MediaStreamSource*() const