Merge 142773

Source/Platform/chromium/public/WebMediaStream.h

 /*
  * 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 18 matching lines @@
 #include "WebNonCopyable.h"
 #include "WebPrivatePtr.h"
 #include "WebVector.h"
 
 namespace WebCore {
 class MediaStreamDescriptor;
 }
 
 namespace WebKit {
 
+class WebMediaStreamSource;
 class WebMediaStreamTrack;
-class WebMediaStreamSource;
 class WebString;
 
 class WebMediaStream {
 public:
     class ExtraData {
     public:
         virtual ~ExtraData() { }
     };
 
     WebMediaStream() { }
     WebMediaStream(const WebMediaStream& other) { assign(other); }
     ~WebMediaStream() { reset(); }
 
     WebMediaStream& operator=(const WebMediaStream& other)
     {
         assign(other);
         return *this;
     }
 
     WEBKIT_EXPORT void assign(const WebMediaStream&);
 
+    // DEPRECATED
     WEBKIT_EXPORT void initialize(const WebString& label, const WebVector<WebMediaStreamSource>& audioSources, const WebVector<WebMediaStreamSource>& videoSources);
+
+    WEBKIT_EXPORT void initialize(const WebString& label, const WebVector<WebMediaStreamTrack>& audioTracks, const WebVector<WebMediaStreamTrack>& videoTracks);
+
     WEBKIT_EXPORT void reset();
     bool isNull() const { return m_private.isNull(); }
 
     // DEPRECATED
     WEBKIT_EXPORT WebString label() const;
 
     WEBKIT_EXPORT WebString id() const;
 
-    WEBKIT_EXPORT void audioSources(WebVector<WebMediaStreamTrack>&) const;
-    WEBKIT_EXPORT void videoSources(WebVector<WebMediaStreamTrack>&) const;
+    WEBKIT_EXPORT void audioTracks(WebVector<WebMediaStreamTrack>&) const;
+    WEBKIT_EXPORT void videoTracks(WebVector<WebMediaStreamTrack>&) const;
+
+    // DEPRECATED
+    void audioSources(WebVector<WebMediaStreamTrack>& tracks) const { audioTracks(tracks); }
+    void videoSources(WebVector<WebMediaStreamTrack>& tracks) const { videoTracks(tracks); }
 
     // Extra data associated with this WebMediaStream.
     // If non-null, the extra data pointer will be deleted when the object is destroyed.
     // Setting the extra data pointer will cause any existing non-null
     // extra data pointer to be deleted.
     WEBKIT_EXPORT ExtraData* extraData() const;
     WEBKIT_EXPORT void setExtraData(ExtraData*);
 
 #if WEBKIT_IMPLEMENTATION
     WebMediaStream(WebCore::MediaStreamDescriptor*);
     WebMediaStream(const WTF::PassRefPtr<WebCore::MediaStreamDescriptor>&);
     operator WTF::PassRefPtr<WebCore::MediaStreamDescriptor>() const;
     operator WebCore::MediaStreamDescriptor*() const;
     WebMediaStream& operator=(const WTF::PassRefPtr<WebCore::MediaStreamDescriptor>&);
 #endif
 
 private:
     WebPrivatePtr<WebCore::MediaStreamDescriptor> m_private;
 };
 
 } // namespace WebKit
 
 #endif // WebMediaStream_h