Merge 142773

Source/WebCore/platform/chromium/support/WebMediaStream.cpp

 /*
  * Copyright (C) 2013 Google Inc. 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
  *     notice, this list of conditions and the following disclaimer in the
@@ skipping 76 matching lines @@
     if (!data)
         return 0;
     return static_cast<ExtraDataContainer*>(data.get())->extraData();
 }
 
 void WebMediaStream::setExtraData(ExtraData* extraData)
 {
     m_private->setExtraData(adoptRef(new ExtraDataContainer(extraData)));
 }
 
-void WebMediaStream::audioSources(WebVector<WebMediaStreamTrack>& webSources) const
+void WebMediaStream::audioTracks(WebVector<WebMediaStreamTrack>& webTracks) const
 {
-    size_t numberOfSources = m_private->numberOfAudioComponents();
-    WebVector<WebMediaStreamTrack> result(numberOfSources);
-    for (size_t i = 0; i < numberOfSources; ++i)
+    size_t numberOfTracks = m_private->numberOfAudioComponents();
+    WebVector<WebMediaStreamTrack> result(numberOfTracks);
+    for (size_t i = 0; i < numberOfTracks; ++i)
         result[i] = m_private->audioComponent(i);
-    webSources.swap(result);
+    webTracks.swap(result);
 }
 
-void WebMediaStream::videoSources(WebVector<WebMediaStreamTrack>& webSources) const
+void WebMediaStream::videoTracks(WebVector<WebMediaStreamTrack>& webTracks) const
 {
-    size_t numberOfSources = m_private->numberOfVideoComponents();
-    WebVector<WebMediaStreamTrack> result(numberOfSources);
-    for (size_t i = 0; i < numberOfSources; ++i)
+    size_t numberOfTracks = m_private->numberOfVideoComponents();
+    WebVector<WebMediaStreamTrack> result(numberOfTracks);
+    for (size_t i = 0; i < numberOfTracks; ++i)
         result[i] = m_private->videoComponent(i);
-    webSources.swap(result);
+    webTracks.swap(result);
 }
 
 WebMediaStream& WebMediaStream::operator=(const PassRefPtr<WebCore::MediaStreamDescriptor>& mediaStreamDescriptor)
 {
     m_private = mediaStreamDescriptor;
     return *this;
 }
 
 WebMediaStream::operator PassRefPtr<WebCore::MediaStreamDescriptor>() const
 {
     return m_private.get();
 }
 
 WebMediaStream::operator WebCore::MediaStreamDescriptor*() const
 {
     return m_private.get();
 }
 
 void WebMediaStream::initialize(const WebString& label, const WebVector<WebMediaStreamSource>& audioSources, const WebVector<WebMediaStreamSource>& videoSources)
 {
-    MediaStreamSourceVector audio, video;
+    MediaStreamComponentVector audio, video;
     for (size_t i = 0; i < audioSources.size(); ++i) {
-        MediaStreamSource* curr = audioSources[i];
-        audio.append(curr);
+        MediaStreamSource* source = audioSources[i];
+        audio.append(MediaStreamComponent::create(source->id(), source));
     }
     for (size_t i = 0; i < videoSources.size(); ++i) {
-        MediaStreamSource* curr = videoSources[i];
-        video.append(curr);
+        MediaStreamSource* source = videoSources[i];
+        video.append(MediaStreamComponent::create(source->id(), source));
+    }
+    m_private = MediaStreamDescriptor::create(label, audio, video);
+}
+
+void WebMediaStream::initialize(const WebString& label, const WebVector<WebMediaStreamTrack>& audioTracks, const WebVector<WebMediaStreamTrack>& videoTracks)
+{
+    MediaStreamComponentVector audio, video;
+    for (size_t i = 0; i < audioTracks.size(); ++i) {
+        MediaStreamComponent* component = audioTracks[i];
+        audio.append(component);
+    }
+    for (size_t i = 0; i < videoTracks.size(); ++i) {
+        MediaStreamComponent* component = videoTracks[i];
+        video.append(component);
     }
     m_private = MediaStreamDescriptor::create(label, audio, video);
 }
 
 void WebMediaStream::assign(const WebMediaStream& other)
 {
     m_private = other.m_private;
 }
 
 } // namespace WebKit
 
 #endif // ENABLE(MEDIA_STREAM)