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

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

Issue 552653005: Oilpan: Move MediaStreamSource, MediaStreamComponent and MediaStreamDescriptor to oilpan's heap (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 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: Source/modules/mediastream/MediaStreamTrack.cpp
diff --git a/Source/modules/mediastream/MediaStreamTrack.cpp b/Source/modules/mediastream/MediaStreamTrack.cpp
index dff6fd007adf1363861c33ac92ce1ec18afa2e1b..593d8d6a299aeeb6259af3f40d4276bd6449c115 100644
--- a/Source/modules/mediastream/MediaStreamTrack.cpp
+++ b/Source/modules/mediastream/MediaStreamTrack.cpp
@@ -58,7 +58,6 @@ MediaStreamTrack::MediaStreamTrack(ExecutionContext* context, MediaStreamCompone
MediaStreamTrack::~MediaStreamTrack()
{
- m_component->source()->removeObserver(this);
}
String MediaStreamTrack::kind() const
@@ -146,9 +145,9 @@ void MediaStreamTrack::stopTrack(ExceptionState& exceptionState)
MediaStreamTrack* MediaStreamTrack::clone(ExecutionContext* context)
{
- RefPtr<MediaStreamComponent> clonedComponent = MediaStreamComponent::create(component()->source());
- MediaStreamTrack* clonedTrack = MediaStreamTrack::create(context, clonedComponent.get());
- MediaStreamCenter::instance().didCreateMediaStreamTrack(clonedComponent.get());
+ MediaStreamComponent* clonedComponent = MediaStreamComponent::create(component()->source());
+ MediaStreamTrack* clonedTrack = MediaStreamTrack::create(context, clonedComponent);
+ MediaStreamCenter::instance().didCreateMediaStreamTrack(clonedComponent);
return clonedTrack;
}
@@ -229,7 +228,9 @@ ExecutionContext* MediaStreamTrack::executionContext() const
void MediaStreamTrack::trace(Visitor* visitor)
{
visitor->trace(m_registeredMediaStreams);
+ visitor->trace(m_component);
EventTargetWithInlineData::trace(visitor);
+ MediaStreamSource::Observer::trace(visitor);
}
} // namespace blink

Powered by Google App Engine
This is Rietveld 408576698