Changeset 144808 in webkit

Timestamp:

Mar 5, 2013 1:15:53 PM (11 years ago)

Author:

tommyw@google.com

Message:

MediaStream API: Allow local and remote descriptions to be accessed after close
​https://bugs.webkit.org/show_bug.cgi?id=111437

Reviewed by Adam Barth.

Source/WebCore:

It's quite clear in the standard that the getters should still return the old value.
Also overhauling the state setters a bit to check if the new state is different.

Existing tests expanded to cover patch.

• Modules/mediastream/RTCPeerConnection.cpp:

(WebCore::RTCPeerConnection::localDescription):
(WebCore::RTCPeerConnection::remoteDescription):
(WebCore::RTCPeerConnection::changeSignalingState):
(WebCore::RTCPeerConnection::changeIceGatheringState):
(WebCore::RTCPeerConnection::changeIceConnectionState):

LayoutTests:

Expanding tests to check the new behaviour.

• fast/mediastream/RTCPeerConnection-localDescription-expected.txt:
• fast/mediastream/RTCPeerConnection-localDescription.html:
• fast/mediastream/RTCPeerConnection-remoteDescription-expected.txt:
• fast/mediastream/RTCPeerConnection-remoteDescription.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/mediastream/RTCPeerConnection-localDescription-expected.txt (modified) (1 diff)
• LayoutTests/fast/mediastream/RTCPeerConnection-localDescription.html (modified) (1 diff)
• LayoutTests/fast/mediastream/RTCPeerConnection-remoteDescription-expected.txt (modified) (1 diff)
• LayoutTests/fast/mediastream/RTCPeerConnection-remoteDescription.html (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-03-05  Tommy Widenflycht  <tommyw@google.com>
+
+        MediaStream API: Allow local and remote descriptions to be accessed after close
+        https://bugs.webkit.org/show_bug.cgi?id=111437
+
+        Reviewed by Adam Barth.
+
+        Expanding tests to check the new behaviour.
+
+        * fast/mediastream/RTCPeerConnection-localDescription-expected.txt:
+        * fast/mediastream/RTCPeerConnection-localDescription.html:
+        * fast/mediastream/RTCPeerConnection-remoteDescription-expected.txt:
+        * fast/mediastream/RTCPeerConnection-remoteDescription.html:
+
 2013-03-05  Eric Seidel  <eric@webkit.org>
 

trunk/LayoutTests/fast/mediastream/RTCPeerConnection-localDescription-expected.txt

@@ -9 +9 @@
 PASS requestFailed was called.
 PASS pc.localDescription.type is "offer"
+PASS pc.localDescription.sdp is "local"
+PASS pc.localDescription.type is "offer"
+PASS pc.localDescription.sdp is "local"
 PASS successfullyParsed is true
 

trunk/LayoutTests/fast/mediastream/RTCPeerConnection-localDescription.html

@@ -14 +14 @@
     testPassed('requestFailed was called.');
 
-    shouldBe('pc.localDescription.type', '"offer"');
+    shouldBeEqualToString('pc.localDescription.type', "offer");
+    shouldBeEqualToString('pc.localDescription.sdp', "local");
+    pc.close();
+    shouldBeEqualToString('pc.localDescription.type', "offer");
+    shouldBeEqualToString('pc.localDescription.sdp', "local");
+
     finishJSTest();
 }

trunk/LayoutTests/fast/mediastream/RTCPeerConnection-remoteDescription-expected.txt

@@ -9 +9 @@
 PASS requestFailed was called.
 PASS pc.remoteDescription.type is "answer"
+PASS pc.remoteDescription.sdp is "remote"
+PASS pc.remoteDescription.type is "answer"
+PASS pc.remoteDescription.sdp is "remote"
 PASS successfullyParsed is true
 

trunk/LayoutTests/fast/mediastream/RTCPeerConnection-remoteDescription.html

@@ -14 +14 @@
     testPassed('requestFailed was called.');
 
-    shouldBe('pc.remoteDescription.type', '"answer"');
+    shouldBeEqualToString('pc.remoteDescription.type', "answer");
+    shouldBeEqualToString('pc.remoteDescription.sdp', "remote");
+    pc.close();
+    shouldBeEqualToString('pc.remoteDescription.type', "answer");
+    shouldBeEqualToString('pc.remoteDescription.sdp', "remote");
+
     finishJSTest();
 }

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-03-05  Tommy Widenflycht  <tommyw@google.com>
+
+        MediaStream API: Allow local and remote descriptions to be accessed after close
+        https://bugs.webkit.org/show_bug.cgi?id=111437
+
+        Reviewed by Adam Barth.
+
+        It's quite clear in the standard that the getters should still return the old value.
+        Also overhauling the state setters a bit to check if the new state is different.
+
+        Existing tests expanded to cover patch.
+
+        * Modules/mediastream/RTCPeerConnection.cpp:
+        (WebCore::RTCPeerConnection::localDescription):
+        (WebCore::RTCPeerConnection::remoteDescription):
+        (WebCore::RTCPeerConnection::changeSignalingState):
+        (WebCore::RTCPeerConnection::changeIceGatheringState):
+        (WebCore::RTCPeerConnection::changeIceConnectionState):
+
 2013-03-05  Charlie Reis  <creis@chromium.org>
 

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

@@ -226 +226 @@
 PassRefPtr<RTCSessionDescription> RTCPeerConnection::localDescription(ExceptionCode& ec)
 {
-    if (m_signalingState == SignalingStateClosed) {
-        ec = INVALID_STATE_ERR;
-        return 0;
-    }
-
     RefPtr<RTCSessionDescriptionDescriptor> descriptor = m_peerHandler->localDescription();
     if (!descriptor)
@@ -258 +253 @@
 PassRefPtr<RTCSessionDescription> RTCPeerConnection::remoteDescription(ExceptionCode& ec)
 {
-    if (m_signalingState == SignalingStateClosed) {
-        ec = INVALID_STATE_ERR;
-        return 0;
-    }
-
     RefPtr<RTCSessionDescriptionDescriptor> descriptor = m_peerHandler->remoteDescription();
     if (!descriptor)
@@ -632 +622 @@
 void RTCPeerConnection::changeSignalingState(SignalingState signalingState)
 {
-    ASSERT(m_signalingState != SignalingStateClosed);
-    m_signalingState = signalingState;
-    scheduleDispatchEvent(Event::create(eventNames().statechangeEvent, false, false));
+    if (m_signalingState != SignalingStateClosed && m_signalingState != signalingState) {
+        m_signalingState = signalingState;
+        scheduleDispatchEvent(Event::create(eventNames().statechangeEvent, false, false));
+    }
 }
 
 void RTCPeerConnection::changeIceGatheringState(IceGatheringState iceGatheringState)
 {
-    m_iceGatheringState = iceGatheringState;
-    scheduleDispatchEvent(Event::create(eventNames().gatheringchangeEvent, false, false));
+    if (m_iceGatheringState != iceGatheringState) {
+        m_iceGatheringState = iceGatheringState;
+        scheduleDispatchEvent(Event::create(eventNames().gatheringchangeEvent, false, false));
+    }
 }
 
 void RTCPeerConnection::changeIceConnectionState(IceConnectionState iceConnectionState)
 {
-    m_iceConnectionState = iceConnectionState;
-    scheduleDispatchEvent(Event::create(eventNames().icechangeEvent, false, false));
+    if (m_iceConnectionState != IceConnectionStateClosed && m_iceConnectionState != iceConnectionState) {
+        m_iceConnectionState = iceConnectionState;
+        scheduleDispatchEvent(Event::create(eventNames().icechangeEvent, false, false));
+    }
 }