Changeset 116317 in webkit

Timestamp:

May 7, 2012 10:32:10 AM (12 years ago)

Author:

tommyw@google.com

Message:

MediaStream API: Allow UserMediaRequest::succeed to take an MediaStreamDescriptor
​https://bugs.webkit.org/show_bug.cgi?id=85798

Reviewed by Adam Barth.

Source/Platform:

Adding another UserMediaRequest::succeed function that takes an MediaStreamDescriptor
instead of the two MediaStreamSource arrays.

• chromium/public/WebMediaStreamCenter.h:

(WebMediaStreamCenter):
(WebKit::WebMediaStreamCenter::constructSDP):

Source/WebCore:

Adding another UserMediaRequest::succeed function that takes an MediaStreamDescriptor
instead of the two MediaStreamSource arrays.

Not currently testable.

• Modules/mediastream/LocalMediaStream.cpp:

(WebCore::LocalMediaStream::create):
(WebCore):
(WebCore::LocalMediaStream::LocalMediaStream):

• Modules/mediastream/LocalMediaStream.h:

(LocalMediaStream):

• Modules/mediastream/UserMediaRequest.cpp:

(WebCore::UserMediaRequest::succeed):
(WebCore):

• Modules/mediastream/UserMediaRequest.h:

(WebCore):
(UserMediaRequest):

Source/WebKit/chromium:

Adding another WebUserMediaRequest::requestSucceed function that takes an
WebMediaStreamDescriptor instead of the two WebMediaStreamSource arrays.

• public/WebUserMediaRequest.h:

(WebKit):
(WebUserMediaRequest):

• src/WebUserMediaRequest.cpp:

(WebKit::WebUserMediaRequest::requestSucceeded):

Location:

trunk/Source

Files:

• Platform/ChangeLog (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/Modules/mediastream/LocalMediaStream.cpp (modified) (1 diff)
• WebCore/Modules/mediastream/LocalMediaStream.h (modified) (2 diffs)
• WebCore/Modules/mediastream/UserMediaRequest.cpp (modified) (2 diffs)
• WebCore/Modules/mediastream/UserMediaRequest.h (modified) (2 diffs)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/public/WebUserMediaRequest.h (modified) (2 diffs)
• WebKit/chromium/src/WebUserMediaRequest.cpp (modified) (3 diffs)

trunk/Source/Platform/ChangeLog

@@ +1 @@
+2012-05-07  Tommy Widenflycht  <tommyw@google.com>
+
+        MediaStream API: Allow UserMediaRequest::succeed to take an MediaStreamDescriptor
+        https://bugs.webkit.org/show_bug.cgi?id=85798
+
+        Reviewed by Adam Barth.
+
+        Adding another UserMediaRequest::succeed function that takes an MediaStreamDescriptor
+        instead of the two MediaStreamSource arrays.
+
+        * chromium/public/WebMediaStreamCenter.h:
+        (WebMediaStreamCenter):
+        (WebKit::WebMediaStreamCenter::constructSDP):
+
 2012-05-04  Tommy Widenflycht  <tommyw@google.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-07  Tommy Widenflycht  <tommyw@google.com>
+
+        MediaStream API: Allow UserMediaRequest::succeed to take an MediaStreamDescriptor
+        https://bugs.webkit.org/show_bug.cgi?id=85798
+
+        Reviewed by Adam Barth.
+
+        Adding another UserMediaRequest::succeed function that takes an MediaStreamDescriptor
+        instead of the two MediaStreamSource arrays.
+
+        Not currently testable.
+
+        * Modules/mediastream/LocalMediaStream.cpp:
+        (WebCore::LocalMediaStream::create):
+        (WebCore):
+        (WebCore::LocalMediaStream::LocalMediaStream):
+        * Modules/mediastream/LocalMediaStream.h:
+        (LocalMediaStream):
+        * Modules/mediastream/UserMediaRequest.cpp:
+        (WebCore::UserMediaRequest::succeed):
+        (WebCore):
+        * Modules/mediastream/UserMediaRequest.h:
+        (WebCore):
+        (UserMediaRequest):
+
 2012-05-07  Michal Mocny  <mmocny@google.com>
 

trunk/Source/WebCore/Modules/mediastream/LocalMediaStream.cpp

@@ -36 +36 @@
 PassRefPtr<LocalMediaStream> LocalMediaStream::create(ScriptExecutionContext* context, const MediaStreamSourceVector& audioSources, const MediaStreamSourceVector& videoSources)
 {
-    return adoptRef(new LocalMediaStream(context, audioSources, videoSources));
+    return adoptRef(new LocalMediaStream(context, MediaStreamDescriptor::create(createCanonicalUUIDString(), audioSources, videoSources)));
 }
 
-LocalMediaStream::LocalMediaStream(ScriptExecutionContext* context, const MediaStreamSourceVector& audioSources, const MediaStreamSourceVector& videoSources)
-    : MediaStream(context, MediaStreamDescriptor::create(createCanonicalUUIDString(), audioSources, videoSources))
+PassRefPtr<LocalMediaStream> LocalMediaStream::create(ScriptExecutionContext* context, PassRefPtr<MediaStreamDescriptor> streamDescriptor)
+{
+    return adoptRef(new LocalMediaStream(context, streamDescriptor));
+}
+
+LocalMediaStream::LocalMediaStream(ScriptExecutionContext* context, PassRefPtr<MediaStreamDescriptor> streamDescriptor)
+    : MediaStream(context, streamDescriptor)
 {
 }

trunk/Source/WebCore/Modules/mediastream/LocalMediaStream.h

@@ -36 +36 @@
 public:
     static PassRefPtr<LocalMediaStream> create(ScriptExecutionContext*, const MediaStreamSourceVector& audioSources, const MediaStreamSourceVector& videoSources);
+    static PassRefPtr<LocalMediaStream> create(ScriptExecutionContext*, PassRefPtr<MediaStreamDescriptor>);
     virtual ~LocalMediaStream();
 
@@ -44 +45 @@
 
 private:
-    LocalMediaStream(ScriptExecutionContext*, const MediaStreamSourceVector& audioSources, const MediaStreamSourceVector& videoSources);
+    LocalMediaStream(ScriptExecutionContext*, PassRefPtr<MediaStreamDescriptor>);
 };
 

trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.cpp

@@ -39 +39 @@
 #include "LocalMediaStream.h"
 #include "MediaStreamCenter.h"
+#include "MediaStreamDescriptor.h"
 #include "SpaceSplitString.h"
 #include "UserMediaController.h"
@@ -89 +90 @@
 }
 
+void UserMediaRequest::succeed(PassRefPtr<MediaStreamDescriptor> streamDescriptor)
+{
+    if (!m_scriptExecutionContext)
+        return;
+
+    RefPtr<LocalMediaStream> stream = LocalMediaStream::create(m_scriptExecutionContext, streamDescriptor);
+    m_successCallback->handleEvent(stream.get());
+}
+
 void UserMediaRequest::fail()
 {

trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.h

@@ -46 +46 @@
 
 class Dictionary;
+class MediaStreamDescriptor;
 class UserMediaController;
 
@@ -59 +60 @@
 
     void succeed(const MediaStreamSourceVector& audioSources, const MediaStreamSourceVector& videoSources);
+    void succeed(PassRefPtr<MediaStreamDescriptor>);
     void fail();
 

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2012-05-07  Tommy Widenflycht  <tommyw@google.com>
+
+        MediaStream API: Allow UserMediaRequest::succeed to take an MediaStreamDescriptor
+        https://bugs.webkit.org/show_bug.cgi?id=85798
+
+        Reviewed by Adam Barth.
+
+        Adding another WebUserMediaRequest::requestSucceed function that takes an
+        WebMediaStreamDescriptor instead of the two WebMediaStreamSource arrays.
+
+        * public/WebUserMediaRequest.h:
+        (WebKit):
+        (WebUserMediaRequest):
+        * src/WebUserMediaRequest.cpp:
+        (WebKit::WebUserMediaRequest::requestSucceeded):
+
 2012-05-07  Kinuko Yasuda  <kinuko@chromium.org>
 

trunk/Source/WebKit/chromium/public/WebUserMediaRequest.h

@@ -42 +42 @@
 namespace WebKit {
 
+class WebMediaStreamDescriptor;
 class WebMediaStreamSource;
 class WebString;
@@ -68 +69 @@
     WEBKIT_EXPORT WebSecurityOrigin securityOrigin() const;
 
+    // DEPRECATED
     WEBKIT_EXPORT void requestSucceeded(const WebVector<WebMediaStreamSource>& audioSources, const WebVector<WebMediaStreamSource>& videoSources);
+
+    WEBKIT_EXPORT void requestSucceeded(const WebMediaStreamDescriptor&);
+
     WEBKIT_EXPORT void requestFailed();
 

trunk/Source/WebKit/chromium/src/WebUserMediaRequest.cpp

@@ -37 +37 @@
 #include "Document.h"
 #include "Frame.h"
+#include "MediaStreamDescriptor.h"
 #include "MediaStreamSource.h"
 #include "Page.h"
@@ -42 +43 @@
 #include "UserMediaRequest.h"
 #include "WebSecurityOrigin.h"
+#include "platform/WebMediaStreamDescriptor.h"
 #include "platform/WebMediaStreamSource.h"
 #include "platform/WebString.h"
@@ -96 +98 @@
 }
 
+void WebUserMediaRequest::requestSucceeded(const WebMediaStreamDescriptor& streamDescriptor)
+{
+    ASSERT(!streamDescriptor.isNull());
+    if (m_private.isNull())
+        return;
+
+    m_private->succeed(streamDescriptor);
+}
+
 void WebUserMediaRequest::requestFailed()
 {