Move MediaStream and MediaStreamTrack implementation from modules/mediastream to core/mediastream.

Source/modules/mediastream/MediaStream.h

Index: Source/modules/mediastream/MediaStream.h
diff --git a/Source/modules/mediastream/MediaStream.h b/Source/modules/mediastream/MediaStream.h
deleted file mode 100644
index 8414760e033a6172b63cd660e456ad9f497b8915..0000000000000000000000000000000000000000
--- a/Source/modules/mediastream/MediaStream.h
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * 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
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef MediaStream_h
-#define MediaStream_h
-
-#include "core/dom/ContextLifecycleObserver.h"
-#include "core/html/URLRegistry.h"
-#include "modules/EventTargetModules.h"
-#include "modules/mediastream/MediaStreamTrack.h"
-#include "platform/Timer.h"
-#include "platform/mediastream/MediaStreamDescriptor.h"
-
-namespace blink {
-
-class ExceptionState;
-
-class MediaStream final
-    : public RefCountedGarbageCollectedWillBeGarbageCollectedFinalized<MediaStream>
-    , public URLRegistrable
-    , public MediaStreamDescriptorClient
-    , public EventTargetWithInlineData
-    , public ContextLifecycleObserver {
-    DEFINE_EVENT_TARGET_REFCOUNTING_WILL_BE_REMOVED(RefCountedGarbageCollectedWillBeGarbageCollectedFinalized<MediaStream>);
-    DEFINE_WRAPPERTYPEINFO();
-    USING_GARBAGE_COLLECTED_MIXIN(MediaStream);
-public:
-    static MediaStream* create(ExecutionContext*);
-    static MediaStream* create(ExecutionContext*, MediaStream*);
-    static MediaStream* create(ExecutionContext*, const MediaStreamTrackVector&);
-    static MediaStream* create(ExecutionContext*, MediaStreamDescriptor*);
-    virtual ~MediaStream();
-
-    // DEPRECATED
-    String label() const { return m_descriptor->id(); }
-
-    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 ended() const;
-    void stop();
-
-    DEFINE_ATTRIBUTE_EVENT_LISTENER(ended);
-    DEFINE_ATTRIBUTE_EVENT_LISTENER(addtrack);
-    DEFINE_ATTRIBUTE_EVENT_LISTENER(removetrack);
-
-    void trackEnded();
-
-    // MediaStreamDescriptorClient
-    virtual void streamEnded() override;
-
-    MediaStreamDescriptor* descriptor() const { return m_descriptor.get(); }
-
-    // EventTarget
-    virtual const AtomicString& interfaceName() const override;
-    virtual ExecutionContext* executionContext() const override;
-
-    // URLRegistrable
-    virtual URLRegistry& registry() const override;
-
-    virtual void trace(Visitor*) override;
-
-private:
-    MediaStream(ExecutionContext*, MediaStreamDescriptor*);
-    MediaStream(ExecutionContext*, const MediaStreamTrackVector& audioTracks, const MediaStreamTrackVector& videoTracks);
-
-    // ContextLifecycleObserver
-    virtual void contextDestroyed() override;
-
-    // MediaStreamDescriptorClient
-    virtual void addRemoteTrack(MediaStreamComponent*) override;
-    virtual void removeRemoteTrack(MediaStreamComponent*) override;
-
-    void scheduleDispatchEvent(PassRefPtrWillBeRawPtr<Event>);
-    void scheduledEventTimerFired(Timer<MediaStream>*);
-
-    bool m_stopped;
-
-    MediaStreamTrackVector m_audioTracks;
-    MediaStreamTrackVector m_videoTracks;
-    Member<MediaStreamDescriptor> m_descriptor;
-
-    Timer<MediaStream> m_scheduledEventTimer;
-    WillBeHeapVector<RefPtrWillBeMember<Event> > m_scheduledEvents;
-};
-
-typedef HeapVector<Member<MediaStream> > MediaStreamVector;
-
-} // namespace blink
-
-#endif // MediaStream_h