Revert 181702 "Oilpan: Move MediaStreamSource, MediaStreamCompon..."

trunk/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 adoptRefCountedGarbageCollectedWillBeNoop(new MediaStream(context, audioTracks, videoTracks));
 }
 
-MediaStream* MediaStream::create(ExecutionContext* context, MediaStreamDescriptor* streamDescriptor)
+MediaStream* MediaStream::create(ExecutionContext* context, PassRefPtr<MediaStreamDescriptor> streamDescriptor)
 {
     return adoptRefCountedGarbageCollectedWillBeNoop(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 32 matching lines @@
     m_descriptor = MediaStreamDescriptor::create(audioComponents, videoComponents);
     m_descriptor->setClient(this);
     MediaStreamCenter::instance().didCreateMediaStream(m_descriptor.get());
 
     m_audioTracks = audioTracks;
     m_videoTracks = videoTracks;
 }
 
 MediaStream::~MediaStream()
 {
+    m_descriptor->setClient(0);
 }
 
 bool MediaStream::ended() const
 {
     return m_stopped || m_descriptor->ended();
 }
 
 MediaStreamTrackVector MediaStream::getTracks()
 {
     MediaStreamTrackVector tracks;
@@ skipping 224 matching lines @@
 URLRegistry& MediaStream::registry() const
 {
     return MediaStreamRegistry::registry();
 }
 
 void MediaStream::trace(Visitor* visitor)
 {
     visitor->trace(m_audioTracks);
     visitor->trace(m_videoTracks);
     visitor->trace(m_scheduledEvents);
-    visitor->trace(m_descriptor);
     EventTargetWithInlineData::trace(visitor);
-    MediaStreamDescriptorClient::trace(visitor);
 }
 
 } // namespace blink