trunk/public/platform/WebMediaStreamSource.h - Issue 650413003: Revert 182826 "Oilpan: Move MediaStreamSource, MediaStreamCompon..."

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: trunk/public/platform/WebMediaStreamSource.h

Issue 650413003: Revert 182826 "Oilpan: Move MediaStreamSource, MediaStreamCompon..." (Closed) Base URL: svn://svn.chromium.org/blink/

Patch Set: Created 6 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:

Index: trunk/public/platform/WebMediaStreamSource.h

===================================================================

--- trunk/public/platform/WebMediaStreamSource.h (revision 183662)

+++ trunk/public/platform/WebMediaStreamSource.h (working copy)

@@ -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;

};

@@ -117,8 +111,9 @@

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;

#endif

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