Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(942)

Unified Diff: Source/modules/mediastream/MediaStream.cpp

Issue 173363002: Move mediastream module to oilpan transition types (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/modules/mediastream/MediaStream.cpp
diff --git a/Source/modules/mediastream/MediaStream.cpp b/Source/modules/mediastream/MediaStream.cpp
index 5d2ead7ab3ab2db473c81e5e1a60c45136a8c904..108639a0c9b9465930a1e14e3d37b0f52c10ad98 100644
--- a/Source/modules/mediastream/MediaStream.cpp
+++ b/Source/modules/mediastream/MediaStream.cpp
@@ -55,7 +55,7 @@ static void processTrack(MediaStreamTrack* track, MediaStreamSourceVector& sourc
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());
@@ -63,7 +63,7 @@ static PassRefPtr<MediaStream> createFromSourceVectors(ExecutionContext* context
return MediaStream::create(context, descriptor.release());
}
-PassRefPtr<MediaStream> MediaStream::create(ExecutionContext* context)
+PassRefPtrWillBeRawPtr<MediaStream> MediaStream::create(ExecutionContext* context)
{
MediaStreamSourceVector audioSources;
MediaStreamSourceVector videoSources;
@@ -71,7 +71,7 @@ PassRefPtr<MediaStream> MediaStream::create(ExecutionContext* context)
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);
@@ -87,7 +87,7 @@ PassRefPtr<MediaStream> MediaStream::create(ExecutionContext* context, PassRefPt
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;
@@ -98,9 +98,9 @@ PassRefPtr<MediaStream> MediaStream::create(ExecutionContext* context, const Med
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)
@@ -133,7 +133,7 @@ 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.");
@@ -145,13 +145,13 @@ void MediaStream::addTrack(PassRefPtr<MediaStreamTrack> prpTrack, ExceptionState
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:
@@ -167,7 +167,7 @@ void MediaStream::addTrack(PassRefPtr<MediaStreamTrack> prpTrack, ExceptionState
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.");
@@ -179,7 +179,7 @@ void MediaStream::removeTrack(PassRefPtr<MediaStreamTrack> prpTrack, ExceptionSt
return;
}
- RefPtr<MediaStreamTrack> track = prpTrack;
+ RefPtrWillBeRawPtr<MediaStreamTrack> track = prpTrack;
size_t pos = kNotFound;
switch (track->component()->source()->type()) {
@@ -277,7 +277,7 @@ void MediaStream::addRemoteTrack(MediaStreamComponent* component)
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);
@@ -318,7 +318,7 @@ void MediaStream::removeRemoteTrack(MediaStreamComponent* component)
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));
}

Powered by Google App Engine
This is Rietveld 408576698