third_party/WebKit/Source/modules/mediastream/MediaStreamTrack.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/Source/modules/mediastream/MediaStreamTrack.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/Source/modules/mediastream/MediaStreamRegistry.h ('k') | third_party/WebKit/Source/modules/mediastream/MediaStreamTrack.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/modules/mediastream/MediaStreamTrack.h

diff --git a/third_party/WebKit/Source/modules/mediastream/MediaStreamTrack.h b/third_party/WebKit/Source/modules/mediastream/MediaStreamTrack.h

index 377e6f9bdc9d48aa83c221fd829e89f93a5169de..bd1e5871697ee5d78d738ac7676ac7223e4140d0 100644

--- a/third_party/WebKit/Source/modules/mediastream/MediaStreamTrack.h

+++ b/third_party/WebKit/Source/modules/mediastream/MediaStreamTrack.h

@@ -46,7 +46,7 @@

, public ActiveDOMObject

, public MediaStreamSource::Observer {

REFCOUNTED_GARBAGE_COLLECTED_EVENT_TARGET(MediaStreamTrack);

- USING_GARBAGE_COLLECTED_MIXIN(MediaStreamTrack);

+ WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(MediaStreamTrack);

DEFINE_WRAPPERTYPEINFO();

public:

static MediaStreamTrack* create(ExecutionContext*, MediaStreamComponent*);

@@ -73,7 +73,7 @@

DEFINE_ATTRIBUTE_EVENT_LISTENER(unmute);

DEFINE_ATTRIBUTE_EVENT_LISTENER(ended);

- MediaStreamComponent* component() { return m_component; }

+ MediaStreamComponent* component();

bool ended() const;

void registerMediaStream(MediaStream*);

@@ -104,7 +104,7 @@

HeapHashSet<Member<MediaStream>> m_registeredMediaStreams;

bool m_isIteratingRegisteredMediaStreams;

bool m_stopped;

- Member<MediaStreamComponent> m_component;

+ RefPtr<MediaStreamComponent> m_component;

};

typedef HeapVector<Member<MediaStreamTrack>> MediaStreamTrackVector;