Diff
Modified: trunk/Source/WebCore/ChangeLog (111873 => 111874)
--- trunk/Source/WebCore/ChangeLog 2012-03-23 17:07:03 UTC (rev 111873)
+++ trunk/Source/WebCore/ChangeLog 2012-03-23 17:10:15 UTC (rev 111874)
@@ -1,3 +1,16 @@
+2012-03-23 Tommy Widenflycht <[email protected]>
+
+ [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 <[email protected]>
Reuse buffer allocation if canvas size does not change
Modified: trunk/Source/WebCore/platform/mediastream/MediaStreamCenter.cpp (111873 => 111874)
--- trunk/Source/WebCore/platform/mediastream/MediaStreamCenter.cpp 2012-03-23 17:07:03 UTC (rev 111873)
+++ trunk/Source/WebCore/platform/mediastream/MediaStreamCenter.cpp 2012-03-23 17:10:15 UTC (rev 111874)
@@ -58,16 +58,6 @@
streamDescriptor->setEnded();
}
-String MediaStreamCenter::constructSDP(IceCandidateDescriptor*)
-{
- return "";
-}
-
-String MediaStreamCenter::constructSDP(SessionDescriptionDescriptor*)
-{
- return "";
-}
-
#if !PLATFORM(CHROMIUM)
// Empty implementations for ports that build with MEDIA_STREAM enabled by default, but haven't yet implemented MediaStreamCenter.
@@ -98,6 +88,16 @@
{
}
+String MediaStreamCenter::constructSDP(IceCandidateDescriptor*)
+{
+ return "";
+}
+
+String MediaStreamCenter::constructSDP(SessionDescriptionDescriptor*)
+{
+ return "";
+}
+
#endif // !PLATFORM(CHROMIUM)
} // namespace WebCore
Modified: trunk/Source/WebKit/chromium/ChangeLog (111873 => 111874)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-03-23 17:07:03 UTC (rev 111873)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-03-23 17:10:15 UTC (rev 111874)
@@ -1,3 +1,26 @@
+2012-03-23 Tommy Widenflycht <[email protected]>
+
+ [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 <[email protected]>
[chromium] Remove unused variables from unittest.
Modified: trunk/Source/WebKit/chromium/bridge/MediaStreamCenter.cpp (111873 => 111874)
--- trunk/Source/WebKit/chromium/bridge/MediaStreamCenter.cpp 2012-03-23 17:07:03 UTC (rev 111873)
+++ trunk/Source/WebKit/chromium/bridge/MediaStreamCenter.cpp 2012-03-23 17:10:15 UTC (rev 111874)
@@ -69,6 +69,16 @@
m_private->didConstructMediaStream(stream);
}
+String MediaStreamCenter::constructSDP(IceCandidateDescriptor* iceCandidate)
+{
+ return m_private->constructSDP(iceCandidate);
+}
+
+String MediaStreamCenter::constructSDP(SessionDescriptionDescriptor* sessionDescription)
+{
+ return m_private->constructSDP(sessionDescription);
+}
+
} // namespace WebCore
#endif // ENABLE(MEDIA_STREAM)
Modified: trunk/Source/WebKit/chromium/bridge/MediaStreamCenterInternal.cpp (111873 => 111874)
--- trunk/Source/WebKit/chromium/bridge/MediaStreamCenterInternal.cpp 2012-03-23 17:07:03 UTC (rev 111873)
+++ trunk/Source/WebKit/chromium/bridge/MediaStreamCenterInternal.cpp 2012-03-23 17:10:15 UTC (rev 111874)
@@ -34,15 +34,19 @@
#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"
#include "platform/WebMediaStreamComponent.h"
#include "platform/WebMediaStreamDescriptor.h"
#include "platform/WebMediaStreamSourcesRequest.h"
+#include "platform/WebSessionDescriptionDescriptor.h"
#include <wtf/PassOwnPtr.h>
namespace WebCore {
@@ -86,6 +90,16 @@
m_private->didConstructMediaStream(stream);
}
+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)
{
m_owner->endLocalMediaStream(stream);
Modified: trunk/Source/WebKit/chromium/bridge/MediaStreamCenterInternal.h (111873 => 111874)
--- trunk/Source/WebKit/chromium/bridge/MediaStreamCenterInternal.h 2012-03-23 17:07:03 UTC (rev 111873)
+++ trunk/Source/WebKit/chromium/bridge/MediaStreamCenterInternal.h 2012-03-23 17:10:15 UTC (rev 111874)
@@ -36,6 +36,7 @@
#include "platform/WebMediaStreamCenterClient.h"
#include <wtf/OwnPtr.h>
#include <wtf/PassRefPtr.h>
+#include <wtf/text/WTFString.h>
namespace WebKit {
class WebMediaStreamCenter;
@@ -43,10 +44,12 @@
namespace WebCore {
+class IceCandidateDescriptor;
class MediaStreamCenter;
class MediaStreamComponent;
class MediaStreamDescriptor;
class MediaStreamSourcesQueryClient;
+class SessionDescriptionDescriptor;
class MediaStreamCenterInternal : public WebKit::WebMediaStreamCenterClient {
public:
@@ -57,6 +60,8 @@
void didSetMediaStreamTrackEnabled(MediaStreamDescriptor*, MediaStreamComponent*);
void didStopLocalMediaStream(MediaStreamDescriptor*);
void didConstructMediaStream(MediaStreamDescriptor*);
+ String constructSDP(IceCandidateDescriptor*);
+ String constructSDP(SessionDescriptionDescriptor*);
// From WebKit::WebMediaStreamCenterClient.
virtual void stopLocalMediaStream(const WebKit::WebMediaStreamDescriptor&);
Modified: trunk/Source/WebKit/chromium/public/platform/WebMediaStreamCenter.h (111873 => 111874)
--- trunk/Source/WebKit/chromium/public/platform/WebMediaStreamCenter.h 2012-03-23 17:07:03 UTC (rev 111873)
+++ trunk/Source/WebKit/chromium/public/platform/WebMediaStreamCenter.h 2012-03-23 17:10:15 UTC (rev 111874)
@@ -31,11 +31,14 @@
#ifndef WebMediaStreamCenter_h
#define WebMediaStreamCenter_h
+#include "WebString.h"
+
namespace WebKit {
-
+class WebICECandidateDescriptor;
class WebMediaStreamComponent;
class WebMediaStreamDescriptor;
class WebMediaStreamSourcesRequest;
+class WebSessionDescriptionDescriptor;
class WebMediaStreamCenter {
public:
@@ -46,6 +49,10 @@
virtual void didDisableMediaStreamTrack(const WebMediaStreamDescriptor&, const WebMediaStreamComponent&) = 0;
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(); }
};
} // namespace WebKit
