Move mediastream module to oilpan transition types

Source/modules/mediastream/MediaStream.cpp

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  * Copyright (C) 2011, 2012 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 18 matching lines @@
 #include "bindings/v8/ExceptionState.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/events/Event.h"
 #include "modules/mediastream/MediaStreamRegistry.h"
 #include "modules/mediastream/MediaStreamTrackEvent.h"
 #include "platform/mediastream/MediaStreamCenter.h"
 #include "platform/mediastream/MediaStreamSource.h"
 
 namespace WebCore {
 
+DEFINE_GC_INFO(MediaStream);
+
 static bool containsSource(MediaStreamSourceVector& sourceVector, MediaStreamSource* source)
 {
     for (size_t i = 0; i < sourceVector.size(); ++i) {
         if (source->id() == sourceVector[i]->id())
             return true;
     }
     return false;
 }
 
 static void processTrack(MediaStreamTrack* track, MediaStreamSourceVector& sourceVector)
 {
     if (track->ended())
         return;
 
     MediaStreamSource* source = track->component()->source();
     if (!containsSource(sourceVector, source))
         sourceVector.append(source);
 }
 
-static PassRefPtr<MediaStream> createFromSourceVectors(ExecutionContext* context, const MediaStreamSourceVector& audioSources, const MediaStreamSourceVector& videoSources)
+static PassRefPtrWillBeRawPtr<MediaStream> createFromSourceVectors(ExecutionContext* context, const MediaStreamSourceVector& audioSources, const MediaStreamSourceVector& videoSources)
 {
     RefPtr<MediaStreamDescriptor> descriptor = MediaStreamDescriptor::create(audioSources, videoSources);
     MediaStreamCenter::instance().didCreateMediaStream(descriptor.get());
 
     return MediaStream::create(context, descriptor.release());
 }
 
-PassRefPtr<MediaStream> MediaStream::create(ExecutionContext* context)
+PassRefPtrWillBeRawPtr<MediaStream> MediaStream::create(ExecutionContext* context)
 {
     MediaStreamSourceVector audioSources;
     MediaStreamSourceVector videoSources;
 
     return createFromSourceVectors(context, audioSources, videoSources);
 }
 
-PassRefPtr<MediaStream> MediaStream::create(ExecutionContext* context, PassRefPtr<MediaStream> stream)
+PassRefPtrWillBeRawPtr<MediaStream> MediaStream::create(ExecutionContext* context, PassRefPtrWillBeRawPtr<MediaStream> stream)
 {
     ASSERT(stream);
 
     MediaStreamSourceVector audioSources;
     MediaStreamSourceVector videoSources;
 
     for (size_t i = 0; i < stream->m_audioTracks.size(); ++i)
         processTrack(stream->m_audioTracks[i].get(), audioSources);
 
     for (size_t i = 0; i < stream->m_videoTracks.size(); ++i)
         processTrack(stream->m_videoTracks[i].get(), videoSources);
 
     return createFromSourceVectors(context, audioSources, videoSources);
 }
 
-PassRefPtr<MediaStream> MediaStream::create(ExecutionContext* context, const MediaStreamTrackVector& tracks)
+PassRefPtrWillBeRawPtr<MediaStream> MediaStream::create(ExecutionContext* context, const MediaStreamTrackVector& tracks)
 {
     MediaStreamSourceVector audioSources;
     MediaStreamSourceVector videoSources;
 
     for (size_t i = 0; i < tracks.size(); ++i)
         processTrack(tracks[i].get(), tracks[i]->kind() == "audio" ? audioSources : videoSources);
 
     return createFromSourceVectors(context, audioSources, videoSources);
 }
 
-PassRefPtr<MediaStream> MediaStream::create(ExecutionContext* context, PassRefPtr<MediaStreamDescriptor> streamDescriptor)
+PassRefPtrWillBeRawPtr<MediaStream> MediaStream::create(ExecutionContext* context, PassRefPtr<MediaStreamDescriptor> streamDescriptor)
 {
-    return adoptRef(new MediaStream(context, streamDescriptor));
+    return adoptRefCountedWillBeRefCountedGarbageCollected(new MediaStream(context, streamDescriptor));
 }
 
 MediaStream::MediaStream(ExecutionContext* context, PassRefPtr<MediaStreamDescriptor> streamDescriptor)
     : ContextLifecycleObserver(context)
     , m_stopped(false)
     , m_descriptor(streamDescriptor)
     , m_scheduledEventTimer(this, &MediaStream::scheduledEventTimerFired)
 {
     ScriptWrappable::init(this);
     m_descriptor->setClient(this);
@@ skipping 12 matching lines @@
 MediaStream::~MediaStream()
 {
     m_descriptor->setClient(0);
 }
 
 bool MediaStream::ended() const
 {
     return m_stopped || m_descriptor->ended();
 }
 
-void MediaStream::addTrack(PassRefPtr<MediaStreamTrack> prpTrack, ExceptionState& exceptionState)
+void MediaStream::addTrack(PassRefPtrWillBeRawPtr<MediaStreamTrack> prpTrack, ExceptionState& exceptionState)
 {
     if (ended()) {
         exceptionState.throwDOMException(InvalidStateError, "The MediaStream is finished.");
         return;
     }
 
     if (!prpTrack) {
         exceptionState.throwDOMException(TypeMismatchError, "The MediaStreamTrack provided is invalid.");
         return;
     }
 
-    RefPtr<MediaStreamTrack> track = prpTrack;
+    RefPtrWillBeRawPtr<MediaStreamTrack> track = prpTrack;
 
     if (getTrackById(track->id()))
         return;
 
     RefPtr<MediaStreamComponent> component = MediaStreamComponent::create(m_descriptor.get(), track->component()->source());
-    RefPtr<MediaStreamTrack> newTrack = MediaStreamTrack::create(executionContext(), component.get());
+    RefPtrWillBeRawPtr<MediaStreamTrack> newTrack = MediaStreamTrack::create(executionContext(), component.get());
 
     switch (component->source()->type()) {
     case MediaStreamSource::TypeAudio:
         m_audioTracks.append(newTrack);
         break;
     case MediaStreamSource::TypeVideo:
         m_videoTracks.append(newTrack);
         break;
     }
 
     m_descriptor->addComponent(component.release());
 
     MediaStreamCenter::instance().didAddMediaStreamTrack(m_descriptor.get(), newTrack->component());
 }
 
-void MediaStream::removeTrack(PassRefPtr<MediaStreamTrack> prpTrack, ExceptionState& exceptionState)
+void MediaStream::removeTrack(PassRefPtrWillBeRawPtr<MediaStreamTrack> prpTrack, ExceptionState& exceptionState)
 {
     if (ended()) {
         exceptionState.throwDOMException(InvalidStateError, "The MediaStream is finished.");
         return;
     }
 
     if (!prpTrack) {
         exceptionState.throwDOMException(TypeMismatchError, "The MediaStreamTrack provided is invalid.");
         return;
     }
 
-    RefPtr<MediaStreamTrack> track = prpTrack;
+    RefPtrWillBeRawPtr<MediaStreamTrack> track = prpTrack;
 
     size_t pos = kNotFound;
     switch (track->component()->source()->type()) {
     case MediaStreamSource::TypeAudio:
         pos = m_audioTracks.find(track);
         if (pos != kNotFound)
             m_audioTracks.remove(pos);
         break;
     case MediaStreamSource::TypeVideo:
         pos = m_videoTracks.find(track);
@@ skipping 77 matching lines @@
 }
 
 void MediaStream::addRemoteTrack(MediaStreamComponent* component)
 {
     ASSERT(component && !component->stream());
     if (ended())
         return;
 
     component->setStream(descriptor());
 
-    RefPtr<MediaStreamTrack> track = MediaStreamTrack::create(executionContext(), component);
+    RefPtrWillBeRawPtr<MediaStreamTrack> track = MediaStreamTrack::create(executionContext(), component);
     switch (component->source()->type()) {
     case MediaStreamSource::TypeAudio:
         m_audioTracks.append(track);
         break;
     case MediaStreamSource::TypeVideo:
         m_videoTracks.append(track);
         break;
     }
     m_descriptor->addComponent(component);
 
@@ skipping 20 matching lines @@
         if ((*tracks)[i]->component() == component) {
             index = i;
             break;
         }
     }
     if (index == kNotFound)
         return;
 
     m_descriptor->removeComponent(component);
 
-    RefPtr<MediaStreamTrack> track = (*tracks)[index];
+    RefPtrWillBeRawPtr<MediaStreamTrack> track = (*tracks)[index];
     tracks->remove(index);
     scheduleDispatchEvent(MediaStreamTrackEvent::create(EventTypeNames::removetrack, false, false, track));
 }
 
 void MediaStream::scheduleDispatchEvent(PassRefPtr<Event> event)
 {
     m_scheduledEvents.append(event);
 
     if (!m_scheduledEventTimer.isActive())
         m_scheduledEventTimer.startOneShot(0);
@@ skipping 13 matching lines @@
 
     events.clear();
 }
 
 URLRegistry& MediaStream::registry() const
 {
     return MediaStreamRegistry::registry();
 }
 
 } // namespace WebCore