Revert "Remove MediaStreamDescriptor and call/use WebMediaStream directly"

public/platform/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 10 matching lines @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef WebMediaStream_h
 #define WebMediaStream_h
 
 #include "WebCommon.h"
 #include "WebNonCopyable.h"
 #include "WebPrivatePtr.h"
-#include "WebString.h"
 #include "WebVector.h"
 
 namespace WebCore {
-class MediaStreamComponent;
+class MediaStreamDescriptor;
 }
 
 namespace WebKit {
 
-class WebMediaStreamClient;
-class WebMediaStreamPrivate;
 class WebMediaStreamSource;
 class WebMediaStreamTrack;
+class WebString;
 
 class WebMediaStream {
 public:
     class ExtraData {
     public:
         virtual ~ExtraData() { }
     };
 
     WebMediaStream() { }
     WebMediaStream(const WebMediaStream& other) { assign(other); }
@@ skipping 32 matching lines @@
     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(WebMediaStreamPrivate*);
-    WebMediaStream(const WebString& label, const WebVector<WebMediaStreamSource>& audioSources, const WebVector<WebMediaStreamSource>& videoSources)
-    {
-        this->initialize(label, audioSources, videoSources);
-    }
-    WebMediaStream(const WebVector<WebMediaStreamTrack>& audioTracks, const WebVector<WebMediaStreamTrack>& videoTracks)
-    {
-        this->initialize(audioTracks, videoTracks);
-    }
-
-    unsigned numberOfAudioComponents() const;
-    WebCore::MediaStreamComponent* audioComponent(unsigned index) const;
-
-    unsigned numberOfVideoComponents() const;
-    WebCore::MediaStreamComponent* videoComponent(unsigned index) const;
-
-    void addComponent(WebCore::MediaStreamComponent*);
-    void removeComponent(WebCore::MediaStreamComponent*);
-
-    void trackEnded();
-    void streamEnded();
-
-    bool ended() const;
-    void setEnded();
-
-    WebKit::WebMediaStreamClient* client();
-    void setClient(WebKit::WebMediaStreamClient*);
+    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<WebMediaStreamPrivate> m_private;
+    WebPrivatePtr<WebCore::MediaStreamDescriptor> m_private;
 };
 
 } // namespace WebKit
 
 #endif // WebMediaStream_h