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

Unified Diff: third_party/WebKit/Source/platform/mediastream/MediaStreamDescriptor.cpp

Issue 1363143003: [Oilpan] Move MediaStream{Source|Component|Descriptor} to Oilpan heap (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Work for comments Created 5 years, 3 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: third_party/WebKit/Source/platform/mediastream/MediaStreamDescriptor.cpp
diff --git a/third_party/WebKit/Source/platform/mediastream/MediaStreamDescriptor.cpp b/third_party/WebKit/Source/platform/mediastream/MediaStreamDescriptor.cpp
index 3e7e71b7d0e26950867ea632d51cdce210055476..ba9d4c9994e13a6fb2b1a29d1ea88979d8c6ea43 100644
--- a/third_party/WebKit/Source/platform/mediastream/MediaStreamDescriptor.cpp
+++ b/third_party/WebKit/Source/platform/mediastream/MediaStreamDescriptor.cpp
@@ -37,22 +37,22 @@
namespace blink {
-PassRefPtr<MediaStreamDescriptor> MediaStreamDescriptor::create(const MediaStreamSourceVector& audioSources, const MediaStreamSourceVector& videoSources)
+MediaStreamDescriptor* MediaStreamDescriptor::create(const MediaStreamSourceVector& audioSources, const MediaStreamSourceVector& videoSources)
{
- return adoptRef(new MediaStreamDescriptor(createCanonicalUUIDString(), audioSources, videoSources));
+ return new MediaStreamDescriptor(createCanonicalUUIDString(), audioSources, videoSources);
}
-PassRefPtr<MediaStreamDescriptor> MediaStreamDescriptor::create(const MediaStreamComponentVector& audioComponents, const MediaStreamComponentVector& videoComponents)
+MediaStreamDescriptor* MediaStreamDescriptor::create(const MediaStreamComponentVector& audioComponents, const MediaStreamComponentVector& videoComponents)
{
- return adoptRef(new MediaStreamDescriptor(createCanonicalUUIDString(), audioComponents, videoComponents));
+ return new MediaStreamDescriptor(createCanonicalUUIDString(), audioComponents, videoComponents);
}
-PassRefPtr<MediaStreamDescriptor> MediaStreamDescriptor::create(const String& id, const MediaStreamComponentVector& audioComponents, const MediaStreamComponentVector& videoComponents)
+MediaStreamDescriptor* MediaStreamDescriptor::create(const String& id, const MediaStreamComponentVector& audioComponents, const MediaStreamComponentVector& videoComponents)
{
- return adoptRef(new MediaStreamDescriptor(id, audioComponents, videoComponents));
+ return new MediaStreamDescriptor(id, audioComponents, videoComponents);
}
-void MediaStreamDescriptor::addComponent(PassRefPtr<MediaStreamComponent> component)
+void MediaStreamDescriptor::addComponent(MediaStreamComponent* component)
{
switch (component->source()->type()) {
case MediaStreamSource::TypeAudio:
@@ -66,7 +66,7 @@ void MediaStreamDescriptor::addComponent(PassRefPtr<MediaStreamComponent> compon
}
}
-void MediaStreamDescriptor::removeComponent(PassRefPtr<MediaStreamComponent> component)
+void MediaStreamDescriptor::removeComponent(MediaStreamComponent* component)
{
size_t pos = kNotFound;
switch (component->source()->type()) {
@@ -126,5 +126,10 @@ MediaStreamDescriptor::MediaStreamDescriptor(const String& id, const MediaStream
m_videoComponents.append((*iter));
}
-} // namespace blink
+DEFINE_TRACE(MediaStreamDescriptor)
+{
+ visitor->trace(m_audioComponents);
+ visitor->trace(m_videoComponents);
+}
+} // namespace blink

Powered by Google App Engine
This is Rietveld 408576698