Reland: [Oilpan] Move MediaStream{Source|Component|Descriptor} to Oilpan heap

third_party/WebKit/Source/modules/mediastream/MediaStream.h

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  * Copyright (C) 2011 Ericsson AB. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 26 matching lines @@
 namespace blink {
 
 class ExceptionState;
 
 class MODULES_EXPORT MediaStream final
     : public RefCountedGarbageCollectedEventTargetWithInlineData<MediaStream>
     , public URLRegistrable
     , public MediaStreamDescriptorClient
     , public ContextLifecycleObserver {
     REFCOUNTED_GARBAGE_COLLECTED_EVENT_TARGET(MediaStream);
-    WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(MediaStream);
+    USING_GARBAGE_COLLECTED_MIXIN(MediaStream);
     DEFINE_WRAPPERTYPEINFO();
 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;
 
     String id() const { return m_descriptor->id(); }
 
     void addTrack(MediaStreamTrack*, ExceptionState&);
     void removeTrack(MediaStreamTrack*, ExceptionState&);
     MediaStreamTrack* getTrackById(String);
     MediaStream* clone(ExecutionContext*);
 
     MediaStreamTrackVector getAudioTracks() const { return m_audioTracks; }
     MediaStreamTrackVector getVideoTracks() const { return m_videoTracks; }
     MediaStreamTrackVector getTracks();
 
     bool active() const { return m_descriptor->active(); }
 
     DEFINE_ATTRIBUTE_EVENT_LISTENER(active);
     DEFINE_ATTRIBUTE_EVENT_LISTENER(inactive);
     DEFINE_ATTRIBUTE_EVENT_LISTENER(ended);
     DEFINE_ATTRIBUTE_EVENT_LISTENER(addtrack);
     DEFINE_ATTRIBUTE_EVENT_LISTENER(removetrack);
 
     void trackEnded();
 
     // MediaStreamDescriptorClient
     void streamEnded() override;
 
-    MediaStreamDescriptor* descriptor() const { return m_descriptor.get(); }
+    MediaStreamDescriptor* descriptor() const { return m_descriptor; }
 
     // EventTarget
     const AtomicString& interfaceName() const override;
     ExecutionContext* executionContext() const override;
 
     // URLRegistrable
     URLRegistry& registry() const override;
 
     // Oilpan: need to eagerly unregister as m_descriptor client.
     EAGERLY_FINALIZE();
     DECLARE_VIRTUAL_TRACE();
 
 private:
-    MediaStream(ExecutionContext*, PassRefPtr<MediaStreamDescriptor>);
+    MediaStream(ExecutionContext*, MediaStreamDescriptor*);
     MediaStream(ExecutionContext*, const MediaStreamTrackVector& audioTracks, const MediaStreamTrackVector& videoTracks);
 
     // ContextLifecycleObserver
     void contextDestroyed() override;
 
     // MediaStreamDescriptorClient
     void addRemoteTrack(MediaStreamComponent*) override;
     void removeRemoteTrack(MediaStreamComponent*) override;
 
     bool emptyOrOnlyEndedTracks();
 
     void scheduleDispatchEvent(PassRefPtrWillBeRawPtr<Event>);
     void scheduledEventTimerFired(Timer<MediaStream>*);
 
     bool m_stopped;
 
     MediaStreamTrackVector m_audioTracks;
     MediaStreamTrackVector m_videoTracks;
-    RefPtr<MediaStreamDescriptor> m_descriptor;
+    Member<MediaStreamDescriptor> m_descriptor;
 
     Timer<MediaStream> m_scheduledEventTimer;
     WillBeHeapVector<RefPtrWillBeMember<Event>> m_scheduledEvents;
 };
 
 typedef HeapVector<Member<MediaStream>> MediaStreamVector;
 
 } // namespace blink
 
 #endif // MediaStream_h