Move mediastream module to oilpan transition types

Source/modules/mediastream/MediaStreamTrack.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 27 matching lines @@
 #include "wtf/Vector.h"
 #include "wtf/text/WTFString.h"
 
 namespace WebCore {
 
 class AudioSourceProvider;
 class ExceptionState;
 class MediaStreamComponent;
 class MediaStreamTrackSourcesCallback;
 
-class MediaStreamTrack FINAL : public RefCounted<MediaStreamTrack>, public ScriptWrappable, public ActiveDOMObject, public EventTargetWithInlineData, public MediaStreamSource::Observer {
-    REFCOUNTED_EVENT_TARGET(MediaStreamTrack);
+class MediaStreamTrack FINAL : public RefCountedWillBeRefCountedGarbageCollected<MediaStreamTrack>, public ScriptWrappable, public ActiveDOMObject, public EventTargetWithInlineData, public MediaStreamSource::Observer {
+    DEFINE_EVENT_TARGET_REFCOUNTING(RefCountedWillBeRefCountedGarbageCollected<MediaStreamTrack>);
 public:
-    class Observer {
-    public:
-        virtual ~Observer() { }
-        virtual void trackEnded() = 0;
-    };
-
-    static PassRefPtr<MediaStreamTrack> create(ExecutionContext*, MediaStreamComponent*);
+    static PassRefPtrWillBeRawPtr<MediaStreamTrack> create(ExecutionContext*, MediaStreamComponent*);
     virtual ~MediaStreamTrack();
 
     String kind() const;
     String id() const;
     String label() const;
 
     bool enabled() const;
     void setEnabled(bool);
 
     String readyState() const;
 
     static void getSources(ExecutionContext*, PassOwnPtr<MediaStreamTrackSourcesCallback>, ExceptionState&);
     void stopTrack(ExceptionState&);
-    PassRefPtr<MediaStreamTrack> clone(ExecutionContext*);
+    PassRefPtrWillBeRawPtr<MediaStreamTrack> clone(ExecutionContext*);
 
     DEFINE_ATTRIBUTE_EVENT_LISTENER(mute);
     DEFINE_ATTRIBUTE_EVENT_LISTENER(unmute);
     DEFINE_ATTRIBUTE_EVENT_LISTENER(ended);
 
     MediaStreamComponent* component();
     bool ended() const;
 
-    void addObserver(Observer*);
-    void removeObserver(Observer*);
+    void registerMediaStream(MediaStream*);
+    void unregisterMediaStream(MediaStream*);
 
     // EventTarget
     virtual const AtomicString& interfaceName() const OVERRIDE;
     virtual ExecutionContext* executionContext() const OVERRIDE;
 
     // ActiveDOMObject
     virtual void stop() OVERRIDE;
 
     PassOwnPtr<AudioSourceProvider> createWebAudioSource();
 
+    void trace(Visitor*);
+
 private:
     MediaStreamTrack(ExecutionContext*, MediaStreamComponent*);
 
     MediaStreamSource::ReadyState m_readyState;
 
     // MediaStreamSourceObserver
     virtual void sourceChangedState() OVERRIDE;
 
     void propagateTrackEnded();
-    Vector<Observer*> m_observers;
-    bool m_isIteratingObservers;
+    WillBeHeapHashSet<RawPtrWillBeWeakMember<MediaStream> > m_registeredMediaStreams;

[haraken, 2014/05/08 05:08:39]

I'm sorry I mentioned that this should be a hash set of weak members, but
shouldn't this probably be a hash set of strong members? It looks like the
MediaStreamTrack and the registered MediaStreams should live and die together.

[keishi, 2014/05/09 01:53:54]

Done.

+    bool m_isIteratingRegisteredMediaStreams;
 
     bool m_stopped;
     RefPtr<MediaStreamComponent> m_component;
 };
 
-typedef Vector<RefPtr<MediaStreamTrack> > MediaStreamTrackVector;
+typedef WillBeHeapVector<RefPtrWillBeMember<MediaStreamTrack> > MediaStreamTrackVector;
 
 } // namespace WebCore
 
 #endif // MediaStreamTrack_h