diff options
Diffstat (limited to 'Source/WebKit/chromium/bridge')
3 files changed, 14 insertions, 10 deletions
diff --git a/Source/WebKit/chromium/bridge/PeerConnectionHandler.cpp b/Source/WebKit/chromium/bridge/PeerConnectionHandler.cpp index e9bd9e82d..c59b2d46c 100644 --- a/Source/WebKit/chromium/bridge/PeerConnectionHandler.cpp +++ b/Source/WebKit/chromium/bridge/PeerConnectionHandler.cpp @@ -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))) { } diff --git a/Source/WebKit/chromium/bridge/PeerConnectionHandlerInternal.cpp b/Source/WebKit/chromium/bridge/PeerConnectionHandlerInternal.cpp index cfc33584a..d8f61f7f0 100644 --- a/Source/WebKit/chromium/bridge/PeerConnectionHandlerInternal.cpp +++ b/Source/WebKit/chromium/bridge/PeerConnectionHandlerInternal.cpp @@ -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() diff --git a/Source/WebKit/chromium/bridge/PeerConnectionHandlerInternal.h b/Source/WebKit/chromium/bridge/PeerConnectionHandlerInternal.h index a3e79e0ac..e17fd96b5 100644 --- a/Source/WebKit/chromium/bridge/PeerConnectionHandlerInternal.h +++ b/Source/WebKit/chromium/bridge/PeerConnectionHandlerInternal.h @@ -48,11 +48,10 @@ class WebMediaStreamDescriptor; 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); |