Diff
Modified: trunk/Source/WebCore/ChangeLog (107860 => 107861)
--- trunk/Source/WebCore/ChangeLog 2012-02-16 01:29:12 UTC (rev 107860)
+++ trunk/Source/WebCore/ChangeLog 2012-02-16 01:35:00 UTC (rev 107861)
@@ -1,3 +1,21 @@
+2012-02-15 Tommy Widenflycht <[email protected]>
+
+ MediaStream API: Removing SecurityContext from the embedder API
+ https://bugs.webkit.org/show_bug.cgi?id=73816
+
+ Reviewed by Darin Fisher.
+
+ Tests for the Media Stream API will be provided by the bug 56587, pending enough landed code.
+
+ * mediastream/PeerConnection.cpp:
+ (WebCore::PeerConnection::PeerConnection):
+ * platform/mediastream/PeerConnectionHandler.h:
+ (WebCore):
+ (PeerConnectionHandler):
+ * platform/mediastream/gstreamer/PeerConnectionHandler.cpp:
+ (WebCore::PeerConnectionHandler::create):
+ (WebCore::PeerConnectionHandler::PeerConnectionHandler):
+
2012-02-15 Nate Chapin <[email protected]>
Fix test regressons from r107672.
Modified: trunk/Source/WebCore/mediastream/PeerConnection.cpp (107860 => 107861)
--- trunk/Source/WebCore/mediastream/PeerConnection.cpp 2012-02-16 01:29:12 UTC (rev 107860)
+++ trunk/Source/WebCore/mediastream/PeerConnection.cpp 2012-02-16 01:35:00 UTC (rev 107861)
@@ -56,7 +56,7 @@
, m_initialNegotiationTimer(this, &PeerConnection::initialNegotiationTimerFired)
, m_streamChangeTimer(this, &PeerConnection::streamChangeTimerFired)
, m_readyStateChangeTimer(this, &PeerConnection::readyStateChangeTimerFired)
- , m_peerHandler(PeerConnectionHandler::create(this, serverConfiguration, context->securityOrigin()))
+ , m_peerHandler(PeerConnectionHandler::create(this, serverConfiguration, context->securityOrigin()->toString()))
{
}
Modified: trunk/Source/WebCore/platform/mediastream/PeerConnectionHandler.h (107860 => 107861)
--- trunk/Source/WebCore/platform/mediastream/PeerConnectionHandler.h 2012-02-16 01:29:12 UTC (rev 107860)
+++ trunk/Source/WebCore/platform/mediastream/PeerConnectionHandler.h 2012-02-16 01:35:00 UTC (rev 107861)
@@ -41,7 +41,6 @@
namespace WebCore {
class PeerConnectionHandlerClient;
-class SecurityOrigin;
#if PLATFORM(CHROMIUM)
class PeerConnectionHandlerInternal;
@@ -51,7 +50,7 @@
WTF_MAKE_NONCOPYABLE(PeerConnectionHandler);
WTF_MAKE_FAST_ALLOCATED;
public:
- static PassOwnPtr<PeerConnectionHandler> create(PeerConnectionHandlerClient*, const String& serverConfiguration, PassRefPtr<SecurityOrigin>);
+ static PassOwnPtr<PeerConnectionHandler> create(PeerConnectionHandlerClient*, const String& serverConfiguration, const String& username);
~PeerConnectionHandler();
void produceInitialOffer(const MediaStreamDescriptorVector& pendingAddStreams);
@@ -63,7 +62,7 @@
void stop();
private:
- PeerConnectionHandler(PeerConnectionHandlerClient*, const String& serverConfiguration, PassRefPtr<SecurityOrigin>);
+ PeerConnectionHandler(PeerConnectionHandlerClient*, const String& serverConfiguration, const String& username);
#if PLATFORM(CHROMIUM)
OwnPtr<PeerConnectionHandlerInternal> m_private;
Modified: trunk/Source/WebCore/platform/mediastream/gstreamer/PeerConnectionHandler.cpp (107860 => 107861)
--- trunk/Source/WebCore/platform/mediastream/gstreamer/PeerConnectionHandler.cpp 2012-02-16 01:29:12 UTC (rev 107860)
+++ trunk/Source/WebCore/platform/mediastream/gstreamer/PeerConnectionHandler.cpp 2012-02-16 01:35:00 UTC (rev 107861)
@@ -35,18 +35,16 @@
#include "PeerConnectionHandler.h"
#include "PeerConnectionHandlerClient.h"
-#include "SecurityOrigin.h"
namespace WebCore {
-PassOwnPtr<PeerConnectionHandler> PeerConnectionHandler::create(PeerConnectionHandlerClient* client, const String& serverConfiguration, PassRefPtr<SecurityOrigin> securityOrigin)
+PassOwnPtr<PeerConnectionHandler> PeerConnectionHandler::create(PeerConnectionHandlerClient* client, const String& serverConfiguration, const String& username)
{
- return adoptPtr(new PeerConnectionHandler(client, serverConfiguration, securityOrigin));
+ return adoptPtr(new PeerConnectionHandler(client, serverConfiguration, username));
}
-// FIXME: remove when real implementations are available
// Empty implementations for ports that build with MEDIA_STREAM enabled by default.
-PeerConnectionHandler::PeerConnectionHandler(PeerConnectionHandlerClient*, const String&, PassRefPtr<SecurityOrigin>)
+PeerConnectionHandler::PeerConnectionHandler(PeerConnectionHandlerClient*, const String&, const String&)
{
}
Modified: trunk/Source/WebKit/chromium/ChangeLog (107860 => 107861)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-02-16 01:29:12 UTC (rev 107860)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-02-16 01:35:00 UTC (rev 107861)
@@ -1,3 +1,22 @@
+2012-02-15 Tommy Widenflycht <[email protected]>
+
+ MediaStream API: Removing SecurityContext from the embedder API
+ https://bugs.webkit.org/show_bug.cgi?id=73816
+
+ Reviewed by Darin Fisher.
+
+ * bridge/PeerConnectionHandler.cpp:
+ (WebCore::PeerConnectionHandler::create):
+ (WebCore::PeerConnectionHandler::PeerConnectionHandler):
+ * bridge/PeerConnectionHandlerInternal.cpp:
+ (WebCore::PeerConnectionHandlerInternal::PeerConnectionHandlerInternal):
+ * bridge/PeerConnectionHandlerInternal.h:
+ (WebCore):
+ (PeerConnectionHandlerInternal):
+ * public/platform/WebPeerConnectionHandler.h:
+ (WebPeerConnectionHandler):
+ (WebKit::WebPeerConnectionHandler::initialize):
+
2012-02-15 Peter Beverloo <[email protected]>
[Chromium] Roll DEPS to r122122
Modified: trunk/Source/WebKit/chromium/bridge/PeerConnectionHandler.cpp (107860 => 107861)
--- trunk/Source/WebKit/chromium/bridge/PeerConnectionHandler.cpp 2012-02-16 01:29:12 UTC (rev 107860)
+++ trunk/Source/WebKit/chromium/bridge/PeerConnectionHandler.cpp 2012-02-16 01:35:00 UTC (rev 107861)
@@ -36,17 +36,16 @@
#include "PeerConnectionHandlerClient.h"
#include "PeerConnectionHandlerInternal.h"
-#include "SecurityOrigin.h"
namespace WebCore {
-PassOwnPtr<PeerConnectionHandler> PeerConnectionHandler::create(PeerConnectionHandlerClient* client, const String& serverConfiguration, PassRefPtr<SecurityOrigin> securityOrigin)
+PassOwnPtr<PeerConnectionHandler> PeerConnectionHandler::create(PeerConnectionHandlerClient* client, const String& serverConfiguration, const String& username)
{
- return adoptPtr(new PeerConnectionHandler(client, serverConfiguration, securityOrigin));
+ return adoptPtr(new PeerConnectionHandler(client, serverConfiguration, username));
}
-PeerConnectionHandler::PeerConnectionHandler(PeerConnectionHandlerClient* client, const String& serverConfiguration, PassRefPtr<SecurityOrigin> securityOrigin)
- : m_private(adoptPtr(new PeerConnectionHandlerInternal(client, serverConfiguration, securityOrigin)))
+PeerConnectionHandler::PeerConnectionHandler(PeerConnectionHandlerClient* client, const String& serverConfiguration, const String& username)
+ : m_private(adoptPtr(new PeerConnectionHandlerInternal(client, serverConfiguration, username)))
{
}
Modified: trunk/Source/WebKit/chromium/bridge/PeerConnectionHandlerInternal.cpp (107860 => 107861)
--- trunk/Source/WebKit/chromium/bridge/PeerConnectionHandlerInternal.cpp 2012-02-16 01:29:12 UTC (rev 107860)
+++ trunk/Source/WebKit/chromium/bridge/PeerConnectionHandlerInternal.cpp 2012-02-16 01:35:00 UTC (rev 107861)
@@ -45,15 +45,21 @@
namespace WebCore {
-PeerConnectionHandlerInternal::PeerConnectionHandlerInternal(PeerConnectionHandlerClient* client, const String& serverConfiguration, PassRefPtr<SecurityOrigin> securityOrigin)
+PeerConnectionHandlerInternal::PeerConnectionHandlerInternal(PeerConnectionHandlerClient* client, const String& serverConfiguration, const String& username)
: m_client(client)
{
ASSERT(m_client);
m_webHandler = adoptPtr(WebKit::webKitPlatformSupport()->createPeerConnectionHandler(this));
// FIXME: When there is some error reporting avaliable in the PeerConnection object report
// if we didn't get a WebPeerConnectionHandler instance.
- if (m_webHandler)
- m_webHandler->initialize(serverConfiguration, securityOrigin);
+
+ if (m_webHandler) {
+ // Dual calls due to API change
+ m_webHandler->initialize(serverConfiguration, username);
+
+ // DEPRECATED
+ m_webHandler->initialize(serverConfiguration, SecurityOrigin::createFromString(username));
+ }
}
PeerConnectionHandlerInternal::~PeerConnectionHandlerInternal()
Modified: trunk/Source/WebKit/chromium/bridge/PeerConnectionHandlerInternal.h (107860 => 107861)
--- trunk/Source/WebKit/chromium/bridge/PeerConnectionHandlerInternal.h 2012-02-16 01:29:12 UTC (rev 107860)
+++ trunk/Source/WebKit/chromium/bridge/PeerConnectionHandlerInternal.h 2012-02-16 01:35:00 UTC (rev 107861)
@@ -48,11 +48,10 @@
namespace WebCore {
class PeerConnectionHandlerClient;
-class SecurityOrigin;
class PeerConnectionHandlerInternal : public WebKit::WebPeerConnectionHandlerClient {
public:
- PeerConnectionHandlerInternal(PeerConnectionHandlerClient*, const String& serverConfiguration, PassRefPtr<SecurityOrigin>);
+ PeerConnectionHandlerInternal(PeerConnectionHandlerClient*, const String& serverConfiguration, const String& username);
~PeerConnectionHandlerInternal();
virtual void produceInitialOffer(const MediaStreamDescriptorVector& pendingAddStreams);
Modified: trunk/Source/WebKit/chromium/public/platform/WebPeerConnectionHandler.h (107860 => 107861)
--- trunk/Source/WebKit/chromium/public/platform/WebPeerConnectionHandler.h 2012-02-16 01:29:12 UTC (rev 107860)
+++ trunk/Source/WebKit/chromium/public/platform/WebPeerConnectionHandler.h 2012-02-16 01:35:00 UTC (rev 107861)
@@ -54,8 +54,11 @@
public:
virtual ~WebPeerConnectionHandler() { }
- virtual void initialize(const WebString& serverConfiguration, const WebSecurityOrigin&) = 0;
+ // DEPRECATED
+ virtual void initialize(const WebString& serverConfiguration, const WebSecurityOrigin&) { };
+ virtual void initialize(const WebString& serverConfiguration, const WebString& username) { };
+
virtual void produceInitialOffer(const WebVector<WebMediaStreamDescriptor>& pendingAddStreams) = 0;
virtual void handleInitialOffer(const WebString& sdp) = 0;
virtual void processSDP(const WebString& sdp) = 0;
