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

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

Issue 11734027: Roll libjingle 254:257 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 12 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
diff --git a/content/renderer/media/rtc_peer_connection_handler.cc b/content/renderer/media/rtc_peer_connection_handler.cc
index ee5766795f424ac0d052660528557f7b129d272a..8da1f9a1760d2374f4a353e87409a96c57ca275d 100644
--- a/content/renderer/media/rtc_peer_connection_handler.cc
+++ b/content/renderer/media/rtc_peer_connection_handler.cc
@@ -62,12 +62,14 @@ GetWebKitReadyState(webrtc::PeerConnectionInterface::ReadyState ready_state) {
switch (ready_state) {
case webrtc::PeerConnectionInterface::kNew:
return WebKit::WebRTCPeerConnectionHandlerClient::ReadyStateNew;
- case webrtc::PeerConnectionInterface::kOpening:
+
+ 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::kClosing:
- return WebKit::WebRTCPeerConnectionHandlerClient::ReadyStateClosing;
case webrtc::PeerConnectionInterface::kClosed:
return WebKit::WebRTCPeerConnectionHandlerClient::ReadyStateClosed;
default:

Powered by Google App Engine
This is Rietveld 408576698