Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(401)

Unified Diff: third_party/WebKit/Source/modules/mediastream/MediaStreamTrack.h

Issue 1363143003: [Oilpan] Move MediaStream{Source|Component|Descriptor} to Oilpan heap (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Revert changes in PS8 Created 5 years, 3 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
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 bd1e5871697ee5d78d738ac7676ac7223e4140d0..377e6f9bdc9d48aa83c221fd829e89f93a5169de 100644
--- a/third_party/WebKit/Source/modules/mediastream/MediaStreamTrack.h
+++ b/third_party/WebKit/Source/modules/mediastream/MediaStreamTrack.h
@@ -46,7 +46,7 @@ class MODULES_EXPORT MediaStreamTrack final
, public ActiveDOMObject
, public MediaStreamSource::Observer {
REFCOUNTED_GARBAGE_COLLECTED_EVENT_TARGET(MediaStreamTrack);
- WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(MediaStreamTrack);
+ USING_GARBAGE_COLLECTED_MIXIN(MediaStreamTrack);
DEFINE_WRAPPERTYPEINFO();
public:
static MediaStreamTrack* create(ExecutionContext*, MediaStreamComponent*);
@@ -73,7 +73,7 @@ public:
DEFINE_ATTRIBUTE_EVENT_LISTENER(unmute);
DEFINE_ATTRIBUTE_EVENT_LISTENER(ended);
- MediaStreamComponent* component();
+ MediaStreamComponent* component() { return m_component; }
bool ended() const;
void registerMediaStream(MediaStream*);
@@ -104,7 +104,7 @@ private:
HeapHashSet<Member<MediaStream>> m_registeredMediaStreams;
bool m_isIteratingRegisteredMediaStreams;
bool m_stopped;
- RefPtr<MediaStreamComponent> m_component;
+ Member<MediaStreamComponent> m_component;
};
typedef HeapVector<Member<MediaStreamTrack>> MediaStreamTrackVector;

Powered by Google App Engine
This is Rietveld 408576698