Changeset 155346 in webkit

Timestamp:

Sep 9, 2013, 6:47:24 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

Adding username to RTCIceServer
​https://bugs.webkit.org/show_bug.cgi?id=120861

Patch by Thiago de Barros Lacerda <​thiago.lacerda@openbossa.org> on 2013-09-09
Reviewed by Eric Carlson.

No new tests needed. Existing media stream tests already cover it

• Modules/mediastream/RTCPeerConnection.cpp:

(WebCore::RTCPeerConnection::parseConfiguration):

• platform/mediastream/RTCConfiguration.h:

(WebCore::RTCIceServer::create):
(WebCore::RTCIceServer::username):
(WebCore::RTCIceServer::RTCIceServer):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/mediastream/RTCPeerConnection.cpp (modified) (2 diffs)
• platform/mediastream/RTCConfiguration.h (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-09-09  Thiago de Barros Lacerda  <thiago.lacerda@openbossa.org>
+
+        Adding username to RTCIceServer
+        https://bugs.webkit.org/show_bug.cgi?id=120861
+
+        Reviewed by Eric Carlson.
+
+        No new tests needed. Existing media stream tests already cover it
+
+        * Modules/mediastream/RTCPeerConnection.cpp:
+        (WebCore::RTCPeerConnection::parseConfiguration):
+        * platform/mediastream/RTCConfiguration.h:
+        (WebCore::RTCIceServer::create):
+        (WebCore::RTCIceServer::username):
+        (WebCore::RTCIceServer::RTCIceServer):
+
 2013-09-09  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp

@@ -94 +94 @@
         }
 
-        String urlString, credential;
+        String urlString, credential, username;
         ok = iceServer.get("url", urlString);
         if (!ok) {
@@ -107 +107 @@
 
         iceServer.get("credential", credential);
-
-        rtcConfiguration->appendServer(RTCIceServer::create(url, credential));
+        iceServer.get("username", username);
+
+        rtcConfiguration->appendServer(RTCIceServer::create(url, credential, username));
     }
 

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

@@ -44 +44 @@
 class RTCIceServer : public RefCounted<RTCIceServer> {
 public:
-    static PassRefPtr<RTCIceServer> create(const KURL& uri, const String& credential)
+    static PassRefPtr<RTCIceServer> create(const KURL& uri, const String& credential, const String& username)
     {
-        return adoptRef(new RTCIceServer(uri, credential));
+        return adoptRef(new RTCIceServer(uri, credential, username));
     }
     virtual ~RTCIceServer() { }
@@ -52 +52 @@
     const KURL& uri() { return m_uri; }
     const String& credential() { return m_credential; }
+    const String& username() { return m_username; }
 
 private:
-    RTCIceServer(const KURL& uri, const String& credential)
+    RTCIceServer(const KURL& uri, const String& credential, const String& username)
         : m_uri(uri)
         , m_credential(credential)
+        , m_username(username)
     {
     }
@@ -62 +64 @@
     KURL m_uri;
     String m_credential;
+    String m_username;
 };