Revert of [Oilpan] Move MediaStream{Source|Component|Descriptor} to Oilpan heap

third_party/WebKit/Source/platform/mediastream/MediaStreamSource.h

 /*
  * Copyright (C) 2011 Ericsson AB. All rights reserved.
  * Copyright (C) 2012 Google Inc. 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.
@@ skipping 26 matching lines @@
 #include "public/platform/WebMediaConstraints.h"
 #include "wtf/OwnPtr.h"
 #include "wtf/PassOwnPtr.h"
 #include "wtf/RefCounted.h"
 #include "wtf/ThreadingPrimitives.h"
 #include "wtf/Vector.h"
 #include "wtf/text/WTFString.h"
 
 namespace blink {
 
-class PLATFORM_EXPORT MediaStreamSource final : public GarbageCollectedFinalized<MediaStreamSource> {
+class PLATFORM_EXPORT MediaStreamSource final : public RefCounted<MediaStreamSource> {
 public:
-    class PLATFORM_EXPORT Observer : public GarbageCollectedMixin {
+    class PLATFORM_EXPORT Observer {
     public:
         virtual ~Observer() { }
         virtual void sourceChangedState() = 0;
     };
 
     class ExtraData {
     public:
         virtual ~ExtraData() { }
     };
 
     enum Type {
         TypeAudio,
         TypeVideo
     };
 
     enum ReadyState {
         ReadyStateLive = 0,
         ReadyStateMuted = 1,
         ReadyStateEnded = 2
     };
 
-    static MediaStreamSource* create(const String& id, Type, const String& name, bool remote, bool readonly, ReadyState = ReadyStateLive, bool requiresConsumer = false);
+    static PassRefPtr<MediaStreamSource> create(const String& id, Type, const String& name, bool remote, bool readonly, ReadyState = ReadyStateLive, bool requiresConsumer = false);
 
     const String& id() const { return m_id; }
     Type type() const { return m_type; }
     const String& name() const { return m_name; }
     bool remote() const { return m_remote; }
     bool readonly() const { return m_readonly; }
 
     void setReadyState(ReadyState);
     ReadyState readyState() const { return m_readyState; }
 
     void addObserver(Observer*);
+    void removeObserver(Observer*);
 
     ExtraData* extraData() const { return m_extraData.get(); }
     void setExtraData(PassOwnPtr<ExtraData> extraData) { m_extraData = extraData; }
 
     void setConstraints(WebMediaConstraints constraints) { m_constraints = constraints; }
     WebMediaConstraints constraints() { return m_constraints; }
 
     void setAudioFormat(size_t numberOfChannels, float sampleRate);
     void consumeAudio(AudioBus*, size_t numberOfFrames);
 
     bool requiresAudioConsumer() const { return m_requiresConsumer; }
     void addAudioConsumer(AudioDestinationConsumer*);
     bool removeAudioConsumer(AudioDestinationConsumer*);
     const HeapHashSet<Member<AudioDestinationConsumer>>& audioConsumers() { return m_audioConsumers; }
 
-    DECLARE_TRACE();
-
 private:
     MediaStreamSource(const String& id, Type, const String& name, bool remote, bool readonly, ReadyState, bool requiresConsumer);
 
     String m_id;
     Type m_type;
     String m_name;
     bool m_remote;
     bool m_readonly;
     ReadyState m_readyState;
     bool m_requiresConsumer;
-    HeapHashSet<WeakMember<Observer>> m_observers;
+    Vector<Observer*> m_observers;
     Mutex m_audioConsumersLock;
-    HeapHashSet<Member<AudioDestinationConsumer>> m_audioConsumers;
+    PersistentHeapHashSet<Member<AudioDestinationConsumer>> m_audioConsumers;
     OwnPtr<ExtraData> m_extraData;
     WebMediaConstraints m_constraints;
 };
 
-typedef HeapVector<Member<MediaStreamSource>> MediaStreamSourceVector;
+typedef Vector<RefPtr<MediaStreamSource>> MediaStreamSourceVector;
 
 } // namespace blink
 
 #endif // MediaStreamSource_h