third_party/WebKit/public/platform/WebMediaStreamSource.h - 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/public/platform/WebMediaStreamSource.h

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/public/platform/WebMediaStream.h ('k') | third_party/WebKit/public/platform/WebMediaStreamTrack.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/public/platform/WebMediaStreamSource.h

diff --git a/third_party/WebKit/public/platform/WebMediaStreamSource.h b/third_party/WebKit/public/platform/WebMediaStreamSource.h

index 5e33a18722afe6d66d2b0e6e807fd340cc2fd654..bb6bdc84986a3dc3bb57c8a8830311b834ce4d60 100644

--- a/third_party/WebKit/public/platform/WebMediaStreamSource.h

+++ b/third_party/WebKit/public/platform/WebMediaStreamSource.h

@@ -35,9 +35,6 @@

#include "WebNonCopyable.h"

#include "WebPrivatePtr.h"

#include "WebVector.h"

-#if INSIDE_BLINK

-#include "platform/heap/Handle.h"

-#endif

namespace blink {

@@ -60,9 +57,6 @@

#endif

private:

-#if INSIDE_BLINK

- GC_PLUGIN_IGNORE("http://crbug.com/409526")

-#endif

MediaStreamSource* m_owner;

};

@@ -119,7 +113,7 @@

BLINK_PLATFORM_EXPORT bool removeAudioConsumer(WebAudioDestinationConsumer*);

#if INSIDE_BLINK

- BLINK_PLATFORM_EXPORT WebMediaStreamSource(MediaStreamSource*);

+ BLINK_PLATFORM_EXPORT WebMediaStreamSource(const WTF::PassRefPtr<MediaStreamSource>&);

BLINK_PLATFORM_EXPORT WebMediaStreamSource& operator=(MediaStreamSource*);

BLINK_PLATFORM_EXPORT operator WTF::PassRefPtr<MediaStreamSource>() const;

BLINK_PLATFORM_EXPORT operator MediaStreamSource*() const;

« no previous file with comments | « third_party/WebKit/public/platform/WebMediaStream.h ('k') | third_party/WebKit/public/platform/WebMediaStreamTrack.h » ('j') | no next file with comments »