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

Unified Diff: third_party/WebKit/Source/modules/mediastream/MediaStream.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: 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/MediaStream.h
diff --git a/third_party/WebKit/Source/modules/mediastream/MediaStream.h b/third_party/WebKit/Source/modules/mediastream/MediaStream.h
index 6ee0ef6da7517d29f540d2ab3a0be4fdaa5f2c98..a43cc24e245d8137f210cea8dc582d4f5b94a6b5 100644
--- a/third_party/WebKit/Source/modules/mediastream/MediaStream.h
+++ b/third_party/WebKit/Source/modules/mediastream/MediaStream.h
@@ -50,7 +50,7 @@ public:
static MediaStream* create(ExecutionContext*);
static MediaStream* create(ExecutionContext*, MediaStream*);
static MediaStream* create(ExecutionContext*, const MediaStreamTrackVector&);
- static MediaStream* create(ExecutionContext*, PassRefPtr<MediaStreamDescriptor>);
+ static MediaStream* create(ExecutionContext*, MediaStreamDescriptor*);
~MediaStream() override;
// DEPRECATED
@@ -82,7 +82,7 @@ public:
// MediaStreamDescriptorClient
void streamEnded() override;
- MediaStreamDescriptor* descriptor() const { return m_descriptor.get(); }
+ MediaStreamDescriptor* descriptor() const { return m_descriptor; }
// EventTarget
const AtomicString& interfaceName() const override;
@@ -96,7 +96,7 @@ public:
DECLARE_VIRTUAL_TRACE();
private:
- MediaStream(ExecutionContext*, PassRefPtr<MediaStreamDescriptor>);
+ MediaStream(ExecutionContext*, MediaStreamDescriptor*);
MediaStream(ExecutionContext*, const MediaStreamTrackVector& audioTracks, const MediaStreamTrackVector& videoTracks);
// ContextLifecycleObserver
@@ -115,7 +115,7 @@ private:
MediaStreamTrackVector m_audioTracks;
MediaStreamTrackVector m_videoTracks;
- RefPtr<MediaStreamDescriptor> m_descriptor;
+ Member<MediaStreamDescriptor> m_descriptor;
Timer<MediaStream> m_scheduledEventTimer;
WillBeHeapVector<RefPtrWillBeMember<Event>> m_scheduledEvents;

Powered by Google App Engine
This is Rietveld 408576698