Source/modules/mediastream/MediaStream.h - Issue 173363002: Move mediastream module to oilpan transition types

Unified Diff: Source/modules/mediastream/MediaStream.h

Issue 173363002: Move mediastream module to oilpan transition types (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: WIP Created 6 years, 10 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

« Source/modules/mediastream/MediaDevicesRequest.h ('K') | « Source/modules/mediastream/MediaDevicesRequest.cpp ('k') | Source/modules/mediastream/MediaStream.cpp » ('j') | Source/modules/mediastream/MediaStreamTrackSourcesRequestImpl.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/modules/mediastream/MediaStream.h

diff --git a/Source/modules/mediastream/MediaStream.h b/Source/modules/mediastream/MediaStream.h

index 53b97c05a42f92db8f206dd743e14d3e055bfbb9..f2b555d8341b119a3333d41d779eb7235bdc109b 100644

--- a/Source/modules/mediastream/MediaStream.h

+++ b/Source/modules/mediastream/MediaStream.h

@@ -40,13 +40,14 @@ namespace WebCore {

class ExceptionState;

-class MediaStream FINAL : public RefCounted<MediaStream>, public ScriptWrappable, public URLRegistrable, public MediaStreamDescriptorClient, public EventTargetWithInlineData, public ContextLifecycleObserver {

- REFCOUNTED_EVENT_TARGET(MediaStream);

+class MediaStream FINAL : public RefCountedWillBeRefCountedGarbageCollected<MediaStream>, public ScriptWrappable, public URLRegistrable, public MediaStreamDescriptorClient, public EventTargetWithInlineData, public ContextLifecycleObserver {

haraken 2014/02/26 13:58:37 Ditto. Please just check that 'RefPtr<MediaStream>

+ DECLARE_GC_INFO;

+ DEFINE_EVENT_TARGET_REFCOUNTING(RefCountedWillBeRefCountedGarbageCollected<MediaStream>);

public:

- static PassRefPtr<MediaStream> create(ExecutionContext*);

- static PassRefPtr<MediaStream> create(ExecutionContext*, PassRefPtr<MediaStream>);

- static PassRefPtr<MediaStream> create(ExecutionContext*, const MediaStreamTrackVector&);

- static PassRefPtr<MediaStream> create(ExecutionContext*, PassRefPtr<MediaStreamDescriptor>);

+ static PassRefPtrWillBeRawPtr<MediaStream> create(ExecutionContext*);

+ static PassRefPtrWillBeRawPtr<MediaStream> create(ExecutionContext*, PassRefPtrWillBeRawPtr<MediaStream>);

+ static PassRefPtrWillBeRawPtr<MediaStream> create(ExecutionContext*, const MediaStreamTrackVector&);

+ static PassRefPtrWillBeRawPtr<MediaStream> create(ExecutionContext*, PassRefPtr<MediaStreamDescriptor>);

virtual ~MediaStream();

// DEPRECATED

@@ -54,8 +55,8 @@ public:

String id() const { return m_descriptor->id(); }

- void addTrack(PassRefPtr<MediaStreamTrack>, ExceptionState&);

- void removeTrack(PassRefPtr<MediaStreamTrack>, ExceptionState&);

+ void addTrack(PassRefPtrWillBeRawPtr<MediaStreamTrack>, ExceptionState&);

+ void removeTrack(PassRefPtrWillBeRawPtr<MediaStreamTrack>, ExceptionState&);

MediaStreamTrack* getTrackById(String);

MediaStreamTrackVector getAudioTracks() const { return m_audioTracks; }

@@ -81,6 +82,8 @@ public:

// URLRegistrable

virtual URLRegistry& registry() const OVERRIDE;

+ void trace(Visitor*) { }

protected:

MediaStream(ExecutionContext*, PassRefPtr<MediaStreamDescriptor>);

@@ -105,7 +108,7 @@ private:

Vector<RefPtr<Event> > m_scheduledEvents;

};

-typedef Vector<RefPtr<MediaStream> > MediaStreamVector;

+typedef WillBeHeapVector<RefPtrWillBeMember<MediaStream> > MediaStreamVector;

} // namespace WebCore