Changeset 111874 in webkit

Timestamp:

Mar 23, 2012 10:10:15 AM (12 years ago)

Author:

tommyw@google.com

Message:

[chromium] MediaStream API (JSEP): Extending WebMediaStreamCenter
​https://bugs.webkit.org/show_bug.cgi?id=81924

Reviewed by Adam Barth.

Source/WebCore:

Nothing to test, just moving methods.

• platform/mediastream/MediaStreamCenter.cpp:

(WebCore::MediaStreamCenter::constructSDP):
(WebCore):

Source/WebKit/chromium:

Adding the two constructSDP methods.

• bridge/MediaStreamCenter.cpp:

(WebCore::MediaStreamCenter::constructSDP):
(WebCore):

• bridge/MediaStreamCenterInternal.cpp:

(WebCore::MediaStreamCenterInternal::constructSDP):
(WebCore):

• bridge/MediaStreamCenterInternal.h:

(WebCore):
(MediaStreamCenterInternal):

• public/platform/WebMediaStreamCenter.h:

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

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/mediastream/MediaStreamCenter.cpp (modified) (2 diffs)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/bridge/MediaStreamCenter.cpp (modified) (1 diff)
• WebKit/chromium/bridge/MediaStreamCenterInternal.cpp (modified) (3 diffs)
• WebKit/chromium/bridge/MediaStreamCenterInternal.h (modified) (3 diffs)
• WebKit/chromium/public/platform/WebMediaStreamCenter.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-03-23  Tommy Widenflycht  <tommyw@google.com>
+
+        [chromium] MediaStream API (JSEP): Extending WebMediaStreamCenter
+        https://bugs.webkit.org/show_bug.cgi?id=81924
+
+        Reviewed by Adam Barth.
+
+        Nothing to test, just moving methods.
+
+        * platform/mediastream/MediaStreamCenter.cpp:
+        (WebCore::MediaStreamCenter::constructSDP):
+        (WebCore):
+
 2012-03-23  Sami Kyostila  <skyostil@chromium.org>
 

trunk/Source/WebCore/platform/mediastream/MediaStreamCenter.cpp

@@ -59 +59 @@
 }
 
-String MediaStreamCenter::constructSDP(IceCandidateDescriptor*)
-{
-    return "";
-}
-
-String MediaStreamCenter::constructSDP(SessionDescriptionDescriptor*)
-{
-    return "";
-}
-
 #if !PLATFORM(CHROMIUM)
 
@@ -99 +89 @@
 }
 
+String MediaStreamCenter::constructSDP(IceCandidateDescriptor*)
+{
+    return "";
+}
+
+String MediaStreamCenter::constructSDP(SessionDescriptionDescriptor*)
+{
+    return "";
+}
+
 #endif // !PLATFORM(CHROMIUM)
 

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2012-03-23  Tommy Widenflycht  <tommyw@google.com>
+
+        [chromium] MediaStream API (JSEP): Extending WebMediaStreamCenter
+        https://bugs.webkit.org/show_bug.cgi?id=81924
+
+        Reviewed by Adam Barth.
+
+        Adding the two constructSDP methods.
+
+        * bridge/MediaStreamCenter.cpp:
+        (WebCore::MediaStreamCenter::constructSDP):
+        (WebCore):
+        * bridge/MediaStreamCenterInternal.cpp:
+        (WebCore::MediaStreamCenterInternal::constructSDP):
+        (WebCore):
+        * bridge/MediaStreamCenterInternal.h:
+        (WebCore):
+        (MediaStreamCenterInternal):
+        * public/platform/WebMediaStreamCenter.h:
+        (WebKit):
+        (WebMediaStreamCenter):
+        (WebKit::WebMediaStreamCenter::constructSDP):
+
 2012-03-23  Jonathan Backer  <backer@chromium.org>
 

trunk/Source/WebKit/chromium/bridge/MediaStreamCenter.cpp

@@ -70 +70 @@
 }
 
+String MediaStreamCenter::constructSDP(IceCandidateDescriptor* iceCandidate)
+{
+    return m_private->constructSDP(iceCandidate);
+}
+
+String MediaStreamCenter::constructSDP(SessionDescriptionDescriptor* sessionDescription)
+{
+    return m_private->constructSDP(sessionDescription);
+}
+
 } // namespace WebCore
 

trunk/Source/WebKit/chromium/bridge/MediaStreamCenterInternal.cpp

@@ -35 +35 @@
 #include "MediaStreamCenterInternal.h"
 
+#include "IceCandidateDescriptor.h"
 #include "MediaStreamCenter.h"
 #include "MediaStreamComponent.h"
 #include "MediaStreamSource.h"
+#include "SessionDescriptionDescriptor.h"
 #include "WebKit.h"
+#include "platform/WebICECandidateDescriptor.h"
 #include "platform/WebKitPlatformSupport.h"
 #include "platform/WebMediaStreamCenter.h"
@@ -44 +47 @@
 #include "platform/WebMediaStreamDescriptor.h"
 #include "platform/WebMediaStreamSourcesRequest.h"
+#include "platform/WebSessionDescriptionDescriptor.h"
 #include <wtf/PassOwnPtr.h>
 
@@ -87 +91 @@
 }
 
+String MediaStreamCenterInternal::constructSDP(IceCandidateDescriptor* iceCandidate)
+{
+    return m_private ? m_private->constructSDP(WebKit::WebICECandidateDescriptor(iceCandidate)) : "";
+}
+
+String MediaStreamCenterInternal::constructSDP(SessionDescriptionDescriptor* sessionDescription)
+{
+    return m_private ? m_private->constructSDP(WebKit::WebSessionDescriptionDescriptor(sessionDescription)) : "";
+}
+
 void MediaStreamCenterInternal::stopLocalMediaStream(const WebKit::WebMediaStreamDescriptor& stream)
 {

trunk/Source/WebKit/chromium/bridge/MediaStreamCenterInternal.h

@@ -37 +37 @@
 #include <wtf/OwnPtr.h>
 #include <wtf/PassRefPtr.h>
+#include <wtf/text/WTFString.h>
 
 namespace WebKit {
@@ -44 +45 @@
 namespace WebCore {
 
+class IceCandidateDescriptor;
 class MediaStreamCenter;
 class MediaStreamComponent;
 class MediaStreamDescriptor;
 class MediaStreamSourcesQueryClient;
+class SessionDescriptionDescriptor;
 
 class MediaStreamCenterInternal : public WebKit::WebMediaStreamCenterClient {
@@ -58 +61 @@
     void didStopLocalMediaStream(MediaStreamDescriptor*);
     void didConstructMediaStream(MediaStreamDescriptor*);
+    String constructSDP(IceCandidateDescriptor*);
+    String constructSDP(SessionDescriptionDescriptor*);
 
     // From WebKit::WebMediaStreamCenterClient.

trunk/Source/WebKit/chromium/public/platform/WebMediaStreamCenter.h

@@ -32 +32 @@
 #define WebMediaStreamCenter_h
 
+#include "WebString.h"
+
 namespace WebKit {
-
+class WebICECandidateDescriptor;
 class WebMediaStreamComponent;
 class WebMediaStreamDescriptor;
 class WebMediaStreamSourcesRequest;
+class WebSessionDescriptionDescriptor;
 
 class WebMediaStreamCenter {
@@ -47 +50 @@
     virtual void didStopLocalMediaStream(const WebMediaStreamDescriptor&) = 0;
     virtual void didConstructMediaStream(const WebMediaStreamDescriptor&) = 0;
+
+    // FIXME: Make pure virtual after implementation.
+    virtual WebString constructSDP(const WebICECandidateDescriptor&) { return WebString(); }
+    virtual WebString constructSDP(const WebSessionDescriptionDescriptor&) { return WebString(); }
 };