Revert of [Oilpan] Move MediaStream{Source|Component|Descriptor} to Oilpan heap

third_party/WebKit/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 71 matching lines @@
 {
     MediaStreamTrackVector audioTracks;
     MediaStreamTrackVector videoTracks;
 
     for (size_t i = 0; i < tracks.size(); ++i)
         processTrack(tracks[i].get(), tracks[i]->kind() == "audio" ? audioTracks : videoTracks);
 
     return new MediaStream(context, audioTracks, videoTracks);
 }
 
-MediaStream* MediaStream::create(ExecutionContext* context, MediaStreamDescriptor* streamDescriptor)
+MediaStream* MediaStream::create(ExecutionContext* context, PassRefPtr<MediaStreamDescriptor> streamDescriptor)
 {
     return new MediaStream(context, streamDescriptor);
 }
 
-MediaStream::MediaStream(ExecutionContext* context, MediaStreamDescriptor* streamDescriptor)
+MediaStream::MediaStream(ExecutionContext* context, PassRefPtr<MediaStreamDescriptor> streamDescriptor)
     : ContextLifecycleObserver(context)
     , m_stopped(false)
     , m_descriptor(streamDescriptor)
     , m_scheduledEventTimer(this, &MediaStream::scheduledEventTimerFired)
 {
     m_descriptor->setClient(this);
 
     size_t numberOfAudioTracks = m_descriptor->numberOfAudioComponents();
     m_audioTracks.reserveCapacity(numberOfAudioTracks);
     for (size_t i = 0; i < numberOfAudioTracks; i++) {
@@ skipping 28 matching lines @@
         (*iter)->registerMediaStream(this);
         audioComponents.append((*iter)->component());
     }
     for (iter = videoTracks.begin(); iter != videoTracks.end(); ++iter) {
         (*iter)->registerMediaStream(this);
         videoComponents.append((*iter)->component());
     }
 
     m_descriptor = MediaStreamDescriptor::create(audioComponents, videoComponents);
     m_descriptor->setClient(this);
-    MediaStreamCenter::instance().didCreateMediaStream(m_descriptor);
+    MediaStreamCenter::instance().didCreateMediaStream(m_descriptor.get());
 
     m_audioTracks = audioTracks;
     m_videoTracks = videoTracks;
     if (emptyOrOnlyEndedTracks()) {
         m_descriptor->setActive(false);
     }
 }
 
 MediaStream::~MediaStream()
 {
+    m_descriptor->setClient(0);
 }
 
 bool MediaStream::emptyOrOnlyEndedTracks()
 {
     if (!m_audioTracks.size() && !m_videoTracks.size()) {
         return true;
     }
     for (MediaStreamTrackVector::iterator iter = m_audioTracks.begin(); iter != m_audioTracks.end(); ++iter) {
         if (!iter->get()->ended())
             return false;
@@ skipping 34 matching lines @@
         break;
     }
     track->registerMediaStream(this);
     m_descriptor->addComponent(track->component());
 
     if (!active() && !track->ended()) {
         m_descriptor->setActive(true);
         scheduleDispatchEvent(Event::create(EventTypeNames::active));
     }
 
-    MediaStreamCenter::instance().didAddMediaStreamTrack(m_descriptor, track->component());
+    MediaStreamCenter::instance().didAddMediaStreamTrack(m_descriptor.get(), track->component());
 }
 
 void MediaStream::removeTrack(MediaStreamTrack* track, ExceptionState& exceptionState)
 {
     if (!track) {
         exceptionState.throwDOMException(TypeMismatchError, "The MediaStreamTrack provided is invalid.");
         return;
     }
 
     size_t pos = kNotFound;
@@ skipping 13 matching lines @@
     if (pos == kNotFound)
         return;
     track->unregisterMediaStream(this);
     m_descriptor->removeComponent(track->component());
 
     if (active() && emptyOrOnlyEndedTracks()) {
         m_descriptor->setActive(false);
         scheduleDispatchEvent(Event::create(EventTypeNames::inactive));
     }
 
-    MediaStreamCenter::instance().didRemoveMediaStreamTrack(m_descriptor, track->component());
+    MediaStreamCenter::instance().didRemoveMediaStreamTrack(m_descriptor.get(), track->component());
 }
 
 MediaStreamTrack* MediaStream::getTrackById(String id)
 {
     for (MediaStreamTrackVector::iterator iter = m_audioTracks.begin(); iter != m_audioTracks.end(); ++iter) {
         if ((*iter)->id() == id)
             return iter->get();
     }
 
     for (MediaStreamTrackVector::iterator iter = m_videoTracks.begin(); iter != m_videoTracks.end(); ++iter) {
@@ skipping 148 matching lines @@
 
 URLRegistry& MediaStream::registry() const
 {
     return MediaStreamRegistry::registry();
 }
 
 DEFINE_TRACE(MediaStream)
 {
     visitor->trace(m_audioTracks);
     visitor->trace(m_videoTracks);
-    visitor->trace(m_descriptor);
     visitor->trace(m_scheduledEvents);
     RefCountedGarbageCollectedEventTargetWithInlineData<MediaStream>::trace(visitor);
     ContextLifecycleObserver::trace(visitor);
-    MediaStreamDescriptorClient::trace(visitor);
 }
 
 } // namespace blink