Index: Source/platform/mediastream/MediaStreamDescriptor.cpp |
diff --git a/Source/platform/mediastream/MediaStreamDescriptor.cpp b/Source/platform/mediastream/MediaStreamDescriptor.cpp |
index 1e801b156433a942ae3079ca8ef6bc7493803d89..00cd60bcf270e12a73c8666957327ec762c8978e 100644 |
--- a/Source/platform/mediastream/MediaStreamDescriptor.cpp |
+++ b/Source/platform/mediastream/MediaStreamDescriptor.cpp |
@@ -37,22 +37,22 @@ |
namespace blink { |
-MediaStreamDescriptor* MediaStreamDescriptor::create(const MediaStreamSourceVector& audioSources, const MediaStreamSourceVector& videoSources) |
+PassRefPtr<MediaStreamDescriptor> MediaStreamDescriptor::create(const MediaStreamSourceVector& audioSources, const MediaStreamSourceVector& videoSources) |
{ |
- return new MediaStreamDescriptor(createCanonicalUUIDString(), audioSources, videoSources); |
+ return adoptRef(new MediaStreamDescriptor(createCanonicalUUIDString(), audioSources, videoSources)); |
} |
-MediaStreamDescriptor* MediaStreamDescriptor::create(const MediaStreamComponentVector& audioComponents, const MediaStreamComponentVector& videoComponents) |
+PassRefPtr<MediaStreamDescriptor> MediaStreamDescriptor::create(const MediaStreamComponentVector& audioComponents, const MediaStreamComponentVector& videoComponents) |
{ |
- return new MediaStreamDescriptor(createCanonicalUUIDString(), audioComponents, videoComponents); |
+ return adoptRef(new MediaStreamDescriptor(createCanonicalUUIDString(), audioComponents, videoComponents)); |
} |
-MediaStreamDescriptor* MediaStreamDescriptor::create(const String& id, const MediaStreamComponentVector& audioComponents, const MediaStreamComponentVector& videoComponents) |
+PassRefPtr<MediaStreamDescriptor> MediaStreamDescriptor::create(const String& id, const MediaStreamComponentVector& audioComponents, const MediaStreamComponentVector& videoComponents) |
{ |
- return new MediaStreamDescriptor(id, audioComponents, videoComponents); |
+ return adoptRef(new MediaStreamDescriptor(id, audioComponents, videoComponents)); |
} |
-void MediaStreamDescriptor::addComponent(MediaStreamComponent* component) |
+void MediaStreamDescriptor::addComponent(PassRefPtr<MediaStreamComponent> component) |
{ |
switch (component->source()->type()) { |
case MediaStreamSource::TypeAudio: |
@@ -66,7 +66,7 @@ |
} |
} |
-void MediaStreamDescriptor::removeComponent(MediaStreamComponent* component) |
+void MediaStreamDescriptor::removeComponent(PassRefPtr<MediaStreamComponent> component) |
{ |
size_t pos = kNotFound; |
switch (component->source()->type()) { |
@@ -100,7 +100,7 @@ |
} |
MediaStreamDescriptor::MediaStreamDescriptor(const String& id, const MediaStreamSourceVector& audioSources, const MediaStreamSourceVector& videoSources) |
- : m_client(nullptr) |
+ : m_client(0) |
, m_id(id) |
, m_ended(false) |
{ |
@@ -113,7 +113,7 @@ |
} |
MediaStreamDescriptor::MediaStreamDescriptor(const String& id, const MediaStreamComponentVector& audioComponents, const MediaStreamComponentVector& videoComponents) |
- : m_client(nullptr) |
+ : m_client(0) |
, m_id(id) |
, m_ended(false) |
{ |
@@ -124,12 +124,5 @@ |
m_videoComponents.append((*iter)); |
} |
-void MediaStreamDescriptor::trace(Visitor* visitor) |
-{ |
- visitor->trace(m_audioComponents); |
- visitor->trace(m_videoComponents); |
- visitor->trace(m_client); |
-} |
- |
} // namespace blink |