MediaStream API: Finalize the RTCPeerConnection states
https://bugs.webkit.org/show_bug.cgi?id=112792
Reviewed by Adam Barth.
Source/Platform:
* chromium/public/WebRTCPeerConnectionHandlerClient.h:
Source/WebCore:
This patch finalized the RTCPeerConnection state and events. These changes
have not yet pushed out to the editors draft; but they are uncontroversial
and agreed upon.
readyState will be deleted; please use the replacement signalingState which is already available.
onstatechange -> onsignalingstatechange
onicechange -> oniceconnectionstatechange
ongatheringchange will be deleted since oniceconnectionstatechange can be used for the same purpose.
RTCIceConnectionState::"starting" -> RTCIceConnectionState::"new"
Patch covered by modified tests.
* Modules/mediastream/RTCPeerConnection.cpp:
(WebCore::RTCPeerConnection::RTCPeerConnection):
(WebCore::RTCPeerConnection::iceConnectionState):
(WebCore::RTCPeerConnection::changeSignalingState):
(WebCore::RTCPeerConnection::changeIceGatheringState):
(WebCore::RTCPeerConnection::changeIceConnectionState):
* Modules/mediastream/RTCPeerConnection.h:
(RTCPeerConnection):
* Modules/mediastream/RTCPeerConnection.idl:
* dom/EventNames.h:
(WebCore):
* platform/mediastream/RTCPeerConnectionHandlerClient.h:
Source/WebKit/chromium:
* src/AssertMatchingEnums.cpp:
LayoutTests:
* fast/mediastream/RTCPeerConnection-datachannel.html:
* fast/mediastream/RTCPeerConnection-dtmf.html:
* fast/mediastream/RTCPeerConnection-events-expected.txt:
* fast/mediastream/RTCPeerConnection-events.html:
* fast/mediastream/RTCPeerConnection-ice.html:
* fast/mediastream/RTCPeerConnection-state-expected.txt:
* fast/mediastream/RTCPeerConnection-state.html:
git-svn-id: https://svn.webkit.org/repository/webkit/trunk/Source/Platform/chromium/public@146582 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebRTCPeerConnectionHandlerClient.h b/WebRTCPeerConnectionHandlerClient.h
index 63d6a76..c07de36 100644
--- a/WebRTCPeerConnectionHandlerClient.h
+++ b/WebRTCPeerConnectionHandlerClient.h
@@ -48,13 +48,16 @@
};
enum ICEConnectionState {
- ICEConnectionStateStarting = 1,
+ ICEConnectionStateNew = 1,
ICEConnectionStateChecking = 2,
ICEConnectionStateConnected = 3,
ICEConnectionStateCompleted = 4,
ICEConnectionStateFailed = 5,
ICEConnectionStateDisconnected = 6,
ICEConnectionStateClosed = 7,
+
+ // DEPRECATED
+ ICEConnectionStateStarting = 1,
};
enum ICEGatheringState {