MediaStream API: Update the RTCPeerConnection states to match the latest specification
authortommyw@google.com <tommyw@google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 21 Jan 2013 08:32:32 +0000 (08:32 +0000)
committertommyw@google.com <tommyw@google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 21 Jan 2013 08:32:32 +0000 (08:32 +0000)
commit429247bd1a9ce9ba77f4be68dc98961cb7dc2ab6
tree67a2d92c7dcc654df87d7d9e4df67561642592ed
parent9f4a7855f9e1a43c19b06873e9f9b6bee076c67f
MediaStream API: Update the RTCPeerConnection states to match the latest specification
https://bugs.webkit.org/show_bug.cgi?id=107120

Reviewed by Adam Barth.

Source/Platform:

Updating the chromium WebKit API for the new states.

* chromium/public/WebRTCPeerConnectionHandlerClient.h:
(WebKit::WebRTCPeerConnectionHandlerClient::~WebRTCPeerConnectionHandlerClient):
(WebRTCPeerConnectionHandlerClient):
(WebKit::WebRTCPeerConnectionHandlerClient::didChangeSignalingState):
(WebKit::WebRTCPeerConnectionHandlerClient::didChangeICEGatheringState):
(WebKit::WebRTCPeerConnectionHandlerClient::didChangeICEConnectionState):
(WebKit::WebRTCPeerConnectionHandlerClient::didAddRemoteDataChannel):
(WebKit::WebRTCPeerConnectionHandlerClient::didChangeReadyState):
(WebKit::WebRTCPeerConnectionHandlerClient::didChangeICEState):

Source/WebCore:

http://dev.w3.org/2011/webrtc/editor/webrtc.html#interface-definition

RTCPeerConnection::readyState and iceState are history and instead signalingState,
iceConnectionState and iceGatheringState have been introduced.

Existing tests updated to cover this patch.

* Modules/mediastream/RTCPeerConnection.cpp:
(WebCore::RTCPeerConnection::RTCPeerConnection):
(WebCore::RTCPeerConnection::createOffer):
(WebCore::RTCPeerConnection::createAnswer):
(WebCore::RTCPeerConnection::setLocalDescription):
(WebCore::RTCPeerConnection::localDescription):
(WebCore::RTCPeerConnection::setRemoteDescription):
(WebCore::RTCPeerConnection::remoteDescription):
(WebCore::RTCPeerConnection::updateIce):
(WebCore::RTCPeerConnection::addIceCandidate):
(WebCore::RTCPeerConnection::readyState):
(WebCore):
(WebCore::RTCPeerConnection::signalingState):
(WebCore::RTCPeerConnection::iceConnectionState):
(WebCore::RTCPeerConnection::addStream):
(WebCore::RTCPeerConnection::removeStream):
(WebCore::RTCPeerConnection::createDataChannel):
(WebCore::RTCPeerConnection::close):
(WebCore::RTCPeerConnection::didChangeSignalingState):
(WebCore::RTCPeerConnection::didChangeIceGatheringState):
(WebCore::RTCPeerConnection::didChangeIceConnectionState):
(WebCore::RTCPeerConnection::didAddRemoteStream):
(WebCore::RTCPeerConnection::didRemoveRemoteStream):
(WebCore::RTCPeerConnection::didAddRemoteDataChannel):
(WebCore::RTCPeerConnection::stop):
(WebCore::RTCPeerConnection::changeSignalingState):
(WebCore::RTCPeerConnection::changeIceGatheringState):
(WebCore::RTCPeerConnection::changeIceConnectionState):
* Modules/mediastream/RTCPeerConnection.h:
(RTCPeerConnection):
* Modules/mediastream/RTCPeerConnection.idl:
* platform/mediastream/RTCPeerConnectionHandlerClient.h:
(RTCPeerConnectionHandlerClient):
* platform/mediastream/chromium/RTCPeerConnectionHandlerChromium.cpp:
(WebCore::RTCPeerConnectionHandlerChromium::didChangeSignalingState):
(WebCore::RTCPeerConnectionHandlerChromium::didChangeICEConnectionState):
* platform/mediastream/chromium/RTCPeerConnectionHandlerChromium.h:
(RTCPeerConnectionHandlerChromium):

Source/WebKit/chromium:

* src/AssertMatchingEnums.cpp:

Tools:

Updating mock to use the new states.

* DumpRenderTree/chromium/MockWebRTCPeerConnectionHandler.cpp:
(RTCPeerConnectionStateTask::RTCPeerConnectionStateTask):
(MockWebRTCPeerConnectionHandler::initialize):
(MockWebRTCPeerConnectionHandler::updateICE):

LayoutTests:

* fast/mediastream/RTCPeerConnection-datachannel-expected.txt:
* fast/mediastream/RTCPeerConnection-datachannel.html:
* fast/mediastream/RTCPeerConnection-ice-expected.txt:
* 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@140310 268f45cc-cd09-0410-ab3c-d52691b4dbfc
20 files changed:
LayoutTests/ChangeLog
LayoutTests/fast/mediastream/RTCPeerConnection-datachannel-expected.txt
LayoutTests/fast/mediastream/RTCPeerConnection-datachannel.html
LayoutTests/fast/mediastream/RTCPeerConnection-ice-expected.txt
LayoutTests/fast/mediastream/RTCPeerConnection-ice.html
LayoutTests/fast/mediastream/RTCPeerConnection-state-expected.txt
LayoutTests/fast/mediastream/RTCPeerConnection-state.html
Source/Platform/ChangeLog
Source/Platform/chromium/public/WebRTCPeerConnectionHandlerClient.h
Source/WebCore/ChangeLog
Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp
Source/WebCore/Modules/mediastream/RTCPeerConnection.h
Source/WebCore/Modules/mediastream/RTCPeerConnection.idl
Source/WebCore/platform/mediastream/RTCPeerConnectionHandlerClient.h
Source/WebCore/platform/mediastream/chromium/RTCPeerConnectionHandlerChromium.cpp
Source/WebCore/platform/mediastream/chromium/RTCPeerConnectionHandlerChromium.h
Source/WebKit/chromium/ChangeLog
Source/WebKit/chromium/src/AssertMatchingEnums.cpp
Tools/ChangeLog
Tools/DumpRenderTree/chromium/MockWebRTCPeerConnectionHandler.cpp