MediaStream API: Moving Add/Remove track from WebMediaStreamCenterClient to WebMediaStream

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 149 matching lines @@
         break;
     case MediaStreamSource::TypeVideo:
         m_descriptor->addVideoComponent(component.release());
         m_videoTracks.append(newTrack);
         break;
     }
 
     MediaStreamCenter::instance().didAddMediaStreamTrack(m_descriptor.get(), newTrack->component());
 }
 
-void MediaStream::removeTrack(PassRefPtr<MediaStreamTrack> prpTrack , ExceptionCode& ec)
+void MediaStream::removeTrack(PassRefPtr<MediaStreamTrack> prpTrack, ExceptionCode& ec)
 {
     if (ended()) {
         ec = INVALID_STATE_ERR;
         return;
     }
 
     if (!prpTrack) {
         ec = TYPE_MISMATCH_ERR;
         return;
     }
@@ skipping 92 matching lines @@
 {
     ASSERT(component && !component->stream());
     if (ended())
         return;
 
     component->setStream(descriptor());
 
     RefPtr<MediaStreamTrack> track = MediaStreamTrack::create(scriptExecutionContext(), component);
     switch (component->source()->type()) {
     case MediaStreamSource::TypeAudio:
+        m_descriptor->addAudioComponent(component);
         m_audioTracks.append(track);
         break;
     case MediaStreamSource::TypeVideo:
+        m_descriptor->addVideoComponent(component);
         m_videoTracks.append(track);
         break;
     }
 
     scheduleDispatchEvent(MediaStreamTrackEvent::create(eventNames().addtrackEvent, false, false, track));
 }
 
 void MediaStream::removeRemoteTrack(MediaStreamComponent* component)
 {
     if (ended())
@@ skipping 12 matching lines @@
     size_t index = notFound;
     for (size_t i = 0; i < tracks->size(); ++i) {
         if ((*tracks)[i]->component() == component) {
             index = i;
             break;
         }
     }
     if (index == notFound)
         return;
 
+    switch (component->source()->type()) {
+    case MediaStreamSource::TypeAudio:
+        m_descriptor->removeAudioComponent(component);
+        break;
+    case MediaStreamSource::TypeVideo:
+        m_descriptor->removeAudioComponent(component);
+        break;
+    }
+
     RefPtr<MediaStreamTrack> track = (*tracks)[index];
     tracks->remove(index);
     scheduleDispatchEvent(MediaStreamTrackEvent::create(eventNames().removetrackEvent, false, false, track));
 }
 
 void MediaStream::scheduleDispatchEvent(PassRefPtr<Event> event)
 {
     m_scheduledEvents.append(event);
 
     if (!m_scheduledEventTimer.isActive())
@@ skipping 11 matching lines @@
     Vector<RefPtr<Event> >::iterator it = events.begin();
     for (; it != events.end(); ++it)
         dispatchEvent((*it).release());
 
     events.clear();
 }
 
 } // namespace WebCore
 
 #endif // ENABLE(MEDIA_STREAM)