Remove MediaStream label, ended attributes and stop() method

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 155 matching lines @@
         if (!iter->get()->ended())
             return false;
     }
     for (MediaStreamTrackVector::iterator iter = m_videoTracks.begin(); iter != m_videoTracks.end(); ++iter) {
         if (!iter->get()->ended())
             return false;
     }
     return true;
 }
 
-bool MediaStream::ended() const
-{
-    return m_stopped || m_descriptor->ended();
-}
-
 MediaStreamTrackVector MediaStream::getTracks()
 {
     MediaStreamTrackVector tracks;
     for (MediaStreamTrackVector::iterator iter = m_audioTracks.begin(); iter != m_audioTracks.end(); ++iter)
         tracks.append(iter->get());
     for (MediaStreamTrackVector::iterator iter = m_videoTracks.begin(); iter != m_videoTracks.end(); ++iter)
         tracks.append(iter->get());
     return tracks;
 }
 
@@ skipping 78 matching lines @@
 MediaStream* MediaStream::clone(ExecutionContext* context)
 {
     MediaStreamTrackVector tracks;
     for (MediaStreamTrackVector::iterator iter = m_audioTracks.begin(); iter != m_audioTracks.end(); ++iter)
         tracks.append((*iter)->clone(context));
     for (MediaStreamTrackVector::iterator iter = m_videoTracks.begin(); iter != m_videoTracks.end(); ++iter)
         tracks.append((*iter)->clone(context));
     return MediaStream::create(context, tracks);
 }
 
-void MediaStream::stop()
-{
-    if (ended())
-        return;
-
-    streamEnded();
-
-    MediaStreamCenter::instance().didStopLocalMediaStream(descriptor());
-}
-
 void MediaStream::trackEnded()
 {
     for (MediaStreamTrackVector::iterator iter = m_audioTracks.begin(); iter != m_audioTracks.end(); ++iter) {
         if (!(*iter)->ended())
             return;
     }
 
     for (MediaStreamTrackVector::iterator iter = m_videoTracks.begin(); iter != m_videoTracks.end(); ++iter) {
         if (!(*iter)->ended())
             return;
     }
 
     streamEnded();
 }
 
 void MediaStream::streamEnded()
 {
-    if (ended())
+    if (m_stopped || m_descriptor->ended())
         return;
 
     if (active()) {
         m_descriptor->setActive(false);
         scheduleDispatchEvent(Event::create(EventTypeNames::inactive));
     }
     m_descriptor->setEnded();
     scheduleDispatchEvent(Event::create(EventTypeNames::ended));
 }
 
 void MediaStream::contextDestroyed()
 {
     ContextLifecycleObserver::contextDestroyed();
     m_stopped = true;
 }
 
 const AtomicString& MediaStream::interfaceName() const
 {
     return EventTargetNames::MediaStream;
 }
 
 ExecutionContext* MediaStream::executionContext() const
 {
     return ContextLifecycleObserver::executionContext();
 }
 
 void MediaStream::addRemoteTrack(MediaStreamComponent* component)
 {
     ASSERT(component);
-    if (ended())
+    if (m_stopped || m_descriptor->ended())
         return;
 
     MediaStreamTrack* track = MediaStreamTrack::create(executionContext(), component);
     switch (component->source()->type()) {
     case MediaStreamSource::TypeAudio:
         m_audioTracks.append(track);
         break;
     case MediaStreamSource::TypeVideo:
         m_videoTracks.append(track);
         break;
@@ skipping 79 matching lines @@
 DEFINE_TRACE(MediaStream)
 {
     visitor->trace(m_audioTracks);
     visitor->trace(m_videoTracks);
     visitor->trace(m_scheduledEvents);
     RefCountedGarbageCollectedEventTargetWithInlineData<MediaStream>::trace(visitor);
     ContextLifecycleObserver::trace(visitor);
 }
 
 } // namespace blink