Changeset 165255 in webkit

Timestamp:

Mar 7, 2014 3:46:53 AM (10 years ago)

Author:

thiago.lacerda@openbossa.org

Message:

[WebRTC] Adding getConfiguration method to RTCPeerConnection
​https://bugs.webkit.org/show_bug.cgi?id=129845

Reviewed by Eric Carlson.

Source/WebCore:

Test: fast/mediastream/RTCPeerConnection-getConfiguration.html

• CMakeLists.txt:
• DerivedSources.make:
• GNUmakefile.list.am:
• Modules/mediastream/RTCConfiguration.idl: Added.
• Modules/mediastream/RTCIceServer.idl: Added.
• Modules/mediastream/RTCPeerConnection.cpp:

(WebCore::RTCPeerConnection::RTCPeerConnection):
(WebCore::RTCPeerConnection::updateIce):
(WebCore::RTCPeerConnection::getConfiguration):

• Modules/mediastream/RTCPeerConnection.h:
• Modules/mediastream/RTCPeerConnection.idl:

LayoutTests:

• fast/mediastream/RTCPeerConnection-getConfiguration-expected.txt: Added.
• fast/mediastream/RTCPeerConnection-getConfiguration.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/mediastream/RTCPeerConnection-getConfiguration-expected.txt (added)
• LayoutTests/fast/mediastream/RTCPeerConnection-getConfiguration.html (added)
• Source/WebCore/CMakeLists.txt (modified) (2 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/DerivedSources.make (modified) (2 diffs)
• Source/WebCore/GNUmakefile.list.am (modified) (4 diffs)
• Source/WebCore/Modules/mediastream/RTCConfiguration.idl (added)
• Source/WebCore/Modules/mediastream/RTCIceServer.idl (added)
• Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp (modified) (4 diffs)
• Source/WebCore/Modules/mediastream/RTCPeerConnection.h (modified) (2 diffs)
• Source/WebCore/Modules/mediastream/RTCPeerConnection.idl (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2014-03-07  Thiago de Barros Lacerda  <thiago.lacerda@openbossa.org>
+
+        [WebRTC] Adding getConfiguration method to RTCPeerConnection
+        https://bugs.webkit.org/show_bug.cgi?id=129845
+
+        Reviewed by Eric Carlson.
+
+        * fast/mediastream/RTCPeerConnection-getConfiguration-expected.txt: Added.
+        * fast/mediastream/RTCPeerConnection-getConfiguration.html: Added.
+
 2014-03-06  Thiago de Barros Lacerda  <thiago.lacerda@openbossa.org>
 

trunk/Source/WebCore/CMakeLists.txt

@@ -218 +218 @@
     Modules/mediastream/NavigatorUserMediaErrorCallback.idl
     Modules/mediastream/NavigatorUserMediaSuccessCallback.idl
+    Modules/mediastream/RTCConfiguration.idl
     Modules/mediastream/RTCDTMFSender.idl
     Modules/mediastream/RTCDTMFToneChangeEvent.idl
@@ -225 +226 @@
     Modules/mediastream/RTCIceCandidate.idl
     Modules/mediastream/RTCIceCandidateEvent.idl
+    Modules/mediastream/RTCIceServer.idl
     Modules/mediastream/RTCPeerConnection.idl
     Modules/mediastream/RTCSessionDescription.idl

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-03-07  Thiago de Barros Lacerda  <thiago.lacerda@openbossa.org>
+
+        [WebRTC] Adding getConfiguration method to RTCPeerConnection
+        https://bugs.webkit.org/show_bug.cgi?id=129845
+
+        Reviewed by Eric Carlson.
+
+        Test: fast/mediastream/RTCPeerConnection-getConfiguration.html
+
+        * CMakeLists.txt:
+        * DerivedSources.make:
+        * GNUmakefile.list.am:
+        * Modules/mediastream/RTCConfiguration.idl: Added.
+        * Modules/mediastream/RTCIceServer.idl: Added.
+        * Modules/mediastream/RTCPeerConnection.cpp:
+        (WebCore::RTCPeerConnection::RTCPeerConnection):
+        (WebCore::RTCPeerConnection::updateIce):
+        (WebCore::RTCPeerConnection::getConfiguration):
+        * Modules/mediastream/RTCPeerConnection.h:
+        * Modules/mediastream/RTCPeerConnection.idl:
+
 2014-03-07  Jinwoo Song  <jinwoo7.song@samsung.com>
 

trunk/Source/WebCore/DerivedSources.make

@@ -126 +126 @@
     $(WebCore)/Modules/mediastream/NavigatorUserMediaErrorCallback.idl \
     $(WebCore)/Modules/mediastream/NavigatorUserMediaSuccessCallback.idl \
+    $(WebCore)/Modules/mediastream/RTCConfiguration.idl \
     $(WebCore)/Modules/mediastream/RTCDTMFSender.idl \
     $(WebCore)/Modules/mediastream/RTCDTMFToneChangeEvent.idl \
@@ -132 +133 @@
     $(WebCore)/Modules/mediastream/RTCIceCandidate.idl \
     $(WebCore)/Modules/mediastream/RTCIceCandidateEvent.idl \
+    $(WebCore)/Modules/mediastream/RTCIceServer.idl \
     $(WebCore)/Modules/mediastream/RTCPeerConnection.idl \
     $(WebCore)/Modules/mediastream/RTCPeerConnectionErrorCallback.idl \

trunk/Source/WebCore/GNUmakefile.list.am

@@ -603 +603 @@
         DerivedSources/WebCore/JSRGBColor.cpp \
         DerivedSources/WebCore/JSRGBColor.h \
+        DerivedSources/WebCore/JSRTCConfiguration.cpp \
+        DerivedSources/WebCore/JSRTCConfiguration.h \
         DerivedSources/WebCore/JSRTCDTMFSender.cpp \
         DerivedSources/WebCore/JSRTCDTMFSender.h \
@@ -617 +619 @@
         DerivedSources/WebCore/JSRTCIceCandidateEvent.cpp \
         DerivedSources/WebCore/JSRTCIceCandidateEvent.h \
+        DerivedSources/WebCore/JSRTCIceServer.cpp \
+        DerivedSources/WebCore/JSRTCIceServer.h \
         DerivedSources/WebCore/JSRTCPeerConnection.cpp \
         DerivedSources/WebCore/JSRTCPeerConnection.h \
@@ -1224 +1228 @@
         $(WebCore)/Modules/mediastream/NavigatorUserMediaErrorCallback.idl \
         $(WebCore)/Modules/mediastream/NavigatorUserMediaSuccessCallback.idl \
+        $(WebCore)/Modules/mediastream/RTCConfiguration.idl \
         $(WebCore)/Modules/mediastream/RTCDTMFSender.idl \
         $(WebCore)/Modules/mediastream/RTCDTMFToneChangeEvent.idl \
@@ -1231 +1236 @@
         $(WebCore)/Modules/mediastream/RTCIceCandidate.idl \
         $(WebCore)/Modules/mediastream/RTCIceCandidateEvent.idl \
+        $(WebCore)/Modules/mediastream/RTCIceServer.idl \
         $(WebCore)/Modules/mediastream/RTCPeerConnection.idl \
         $(WebCore)/Modules/mediastream/RTCSessionDescription.idl \

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

@@ -176 +176 @@
     , m_iceConnectionState(IceConnectionStateNew)
     , m_scheduledEventTimer(this, &RTCPeerConnection::scheduledEventTimerFired)
+    , m_configuration(configuration)
     , m_stopped(false)
 {
@@ -193 +194 @@
     document.frame()->loader().client().dispatchWillStartUsingPeerConnectionHandler(m_peerHandler.get());
 
-    if (!m_peerHandler->initialize(configuration)) {
+    if (!m_peerHandler->initialize(m_configuration)) {
         ec = NOT_SUPPORTED_ERR;
         return;
@@ -362 +363 @@
     }
 
-    RefPtr<RTCConfiguration> configuration = parseConfiguration(rtcConfiguration, ec);
+    m_configuration = parseConfiguration(rtcConfiguration, ec);
     if (ec)
         return;
 
-    bool valid = m_peerHandler->updateIce(configuration);
+    bool valid = m_peerHandler->updateIce(m_configuration);
     if (!valid)
         ec = SYNTAX_ERR;
@@ -497 +498 @@
 }
 
+RTCConfiguration* RTCPeerConnection::getConfiguration() const
+{
+    return m_configuration.get();
+}
+
 MediaStreamVector RTCPeerConnection::getLocalStreams() const
 {

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

@@ -84 +84 @@
     String iceConnectionState() const;
 
+    RTCConfiguration* getConfiguration() const;
+
     MediaStreamVector getLocalStreams() const;
 
@@ -166 +168 @@
     Vector<RefPtr<Event>> m_scheduledEvents;
 
+    RefPtr<RTCConfiguration> m_configuration;
+
     bool m_stopped;
 };

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

@@ -63 +63 @@
     MediaStream getStreamById(DOMString streamId);
 
+    RTCConfiguration getConfiguration();
+
     [StrictTypeChecking, RaisesException] void addStream(MediaStream stream);
     [StrictTypeChecking, RaisesException] void removeStream(MediaStream stream);