admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename PeerConnection::OnIceConnectionChange to OnIceConnectionStateChange

Browse Source 
for consistency with the WebRTC 1.0 standard as suggested in a TODO.

BUG=None

Review-Url: https://codereview.webrtc.org/2732663004
Cr-Commit-Position: refs/heads/master@{#17077}
This commit is contained in:
zstein 2017-03-06 13:49:03 -08:00 committed by Commit bot
parent ad94c4c5d9
commit 6dfd53a81e
5 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
webrtc/pc/peerconnection.cc
View File

@ -1654,7 +1654,7 @@ void PeerConnection::DestroyReceiver(const std::string& track_id) {
}
}
void PeerConnection::OnIceConnectionChange(
void PeerConnection::OnIceConnectionStateChange(
PeerConnectionInterface::IceConnectionState new_state) {
RTC_DCHECK(signaling_thread()->IsCurrent());
// After transitioning to "closed", ignore any additional states from

2
webrtc/pc/peerconnection.h
View File

@ -203,7 +203,7 @@ class PeerConnection : public PeerConnectionInterface,
VideoTrackInterface* video_track);
// Implements IceObserver
void OnIceConnectionChange(IceConnectionState new_state) override;
void OnIceConnectionStateChange(IceConnectionState new_state) override;
void OnIceGatheringChange(IceGatheringState new_state) override;
void OnIceCandidate(const IceCandidateInterface* candidate) override;
void OnIceCandidatesRemoved(

2
webrtc/pc/webrtcsession.cc
View File

@ -1425,7 +1425,7 @@ void WebRtcSession::SetIceConnectionState(
PeerConnectionInterface::kIceConnectionClosed);
ice_connection_state_ = state;
if (ice_observer_) {
ice_observer_->OnIceConnectionChange(ice_connection_state_);
ice_observer_->OnIceConnectionStateChange(ice_connection_state_);
}
}

4
webrtc/pc/webrtcsession.h
View File

@ -82,9 +82,7 @@ class IceObserver {
public:
IceObserver() {}
// Called any time the IceConnectionState changes
// TODO(honghaiz): Change the name to OnIceConnectionStateChange so as to
// conform to the w3c standard.
virtual void OnIceConnectionChange(
virtual void OnIceConnectionStateChange(
PeerConnectionInterface::IceConnectionState new_state) {}
// Called any time the IceGatheringState changes
virtual void OnIceGatheringChange(

2
webrtc/pc/webrtcsession_unittest.cc
View File

@ -157,7 +157,7 @@ class MockIceObserver : public webrtc::IceObserver {
virtual ~MockIceObserver() = default;
void OnIceConnectionChange(
void OnIceConnectionStateChange(
PeerConnectionInterface::IceConnectionState new_state) override {
ice_connection_state_ = new_state;
ice_connection_state_history_.push_back(new_state);