Changeset 107861 in webkit

Timestamp:

Feb 15, 2012 5:35:00 PM (12 years ago)

Author:

tommyw@google.com

Message:

MediaStream API: Removing SecurityContext from the embedder API
​https://bugs.webkit.org/show_bug.cgi?id=73816

Reviewed by Darin Fisher.

Source/WebCore:

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):

Source/WebKit/chromium:

• 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):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/mediastream/PeerConnection.cpp (modified) (1 diff)
• WebCore/platform/mediastream/PeerConnectionHandler.h (modified) (3 diffs)
• WebCore/platform/mediastream/gstreamer/PeerConnectionHandler.cpp (modified) (1 diff)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/bridge/PeerConnectionHandler.cpp (modified) (1 diff)
• WebKit/chromium/bridge/PeerConnectionHandlerInternal.cpp (modified) (2 diffs)
• WebKit/chromium/bridge/PeerConnectionHandlerInternal.h (modified) (1 diff)
• WebKit/chromium/public/platform/WebPeerConnectionHandler.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-15  Tommy Widenflycht  <tommyw@google.com>
+
+        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  <japhet@chromium.org>
 

trunk/Source/WebCore/mediastream/PeerConnection.cpp

@@ -57 +57 @@
     , 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()))
 {
 }

trunk/Source/WebCore/platform/mediastream/PeerConnectionHandler.h

@@ -42 +42 @@
 
 class PeerConnectionHandlerClient;
-class SecurityOrigin;
 
 #if PLATFORM(CHROMIUM)
@@ -52 +51 @@
     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();
 
@@ -64 +63 @@
 
 private:
-    PeerConnectionHandler(PeerConnectionHandlerClient*, const String& serverConfiguration, PassRefPtr<SecurityOrigin>);
+    PeerConnectionHandler(PeerConnectionHandlerClient*, const String& serverConfiguration, const String& username);
 
 #if PLATFORM(CHROMIUM)

trunk/Source/WebCore/platform/mediastream/gstreamer/PeerConnectionHandler.cpp

@@ -36 +36 @@
 
 #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&)
 {
 }

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2012-02-15  Tommy Widenflycht  <tommyw@google.com>
+
+        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  <peter@chromium.org>
 

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

@@ -37 +37 @@
 #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)))
 {
 }

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

@@ -46 +46 @@
 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)
 {
@@ -53 +53 @@
     // 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));
+    }
 }
 

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

@@ -49 +49 @@
 
 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();
 

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

@@ -55 +55 @@
     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;