Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(719)

Unified Diff: content/renderer/media/rtc_peer_connection_handler.cc

Issue 11828060: Roll libjingle 257:260. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/renderer/media/rtc_peer_connection_handler.cc
===================================================================
--- content/renderer/media/rtc_peer_connection_handler.cc (revision 176188)
+++ content/renderer/media/rtc_peer_connection_handler.cc (working copy)
@@ -62,16 +62,14 @@
static WebKit::WebRTCPeerConnectionHandlerClient::ReadyState
GetWebKitReadyState(webrtc::PeerConnectionInterface::ReadyState ready_state) {
switch (ready_state) {
- case webrtc::PeerConnectionInterface::kNew:
- return WebKit::WebRTCPeerConnectionHandlerClient::ReadyStateNew;
+ case webrtc::PeerConnectionInterface::kStable:
+ return WebKit::WebRTCPeerConnectionHandlerClient::ReadyStateActive;
case webrtc::PeerConnectionInterface::kHaveLocalOffer:
case webrtc::PeerConnectionInterface::kHaveLocalPrAnswer:
case webrtc::PeerConnectionInterface::kHaveRemoteOffer:
case webrtc::PeerConnectionInterface::kHaveRemotePrAnswer:
return WebKit::WebRTCPeerConnectionHandlerClient::ReadyStateOpening;
- case webrtc::PeerConnectionInterface::kActive:
- return WebKit::WebRTCPeerConnectionHandlerClient::ReadyStateActive;
case webrtc::PeerConnectionInterface::kClosed:
return WebKit::WebRTCPeerConnectionHandlerClient::ReadyStateClosed;
default:
@@ -517,7 +515,7 @@
void RTCPeerConnectionHandler::OnStateChange(StateType state_changed) {
switch (state_changed) {
- case kReadyState: {
+ case kSignalingState: {
WebKit::WebRTCPeerConnectionHandlerClient::ReadyState ready_state =
GetWebKitReadyState(native_peer_connection_->ready_state());
client_->didChangeReadyState(ready_state);
« no previous file with comments | « content/renderer/media/peer_connection_handler_base.cc ('k') | content/renderer/media/rtc_peer_connection_handler_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698