Use scoped_refptr for On(Add|Remove)Stream and OnDataChannel.
This will make it much less likely for application developers to not
realize the object is reference counted.
It also fixes a bug in the Java PeerConnection binding, by allowing a
reference to be transferred in the OnRemoveStream call via std::move.
BUG=webrtc:5128
R=pthatcher@webrtc.org, tkchin@webrtc.org
Review URL: https://codereview.webrtc.org/1972793003 .
Cr-Commit-Position: refs/heads/master@{#12976}
diff --git a/webrtc/api/peerconnectioninterface.h b/webrtc/api/peerconnectioninterface.h
index 4fa9bf2..4fdbd93 100644
--- a/webrtc/api/peerconnectioninterface.h
+++ b/webrtc/api/peerconnectioninterface.h
@@ -503,27 +503,40 @@
virtual void OnSignalingChange(
PeerConnectionInterface::SignalingState new_state) = 0;
+ // TODO(deadbeef): Once all subclasses override the scoped_refptr versions
+ // of the below three methods, make them pure virtual and remove the raw
+ // pointer version.
+
// Triggered when media is received on a new stream from remote peer.
- virtual void OnAddStream(MediaStreamInterface* stream) = 0;
+ virtual void OnAddStream(rtc::scoped_refptr<MediaStreamInterface> stream) {}
+ // Deprecated; please use the version that uses a scoped_refptr.
+ virtual void OnAddStream(MediaStreamInterface* stream) {}
// Triggered when a remote peer close a stream.
- virtual void OnRemoveStream(MediaStreamInterface* stream) = 0;
+ virtual void OnRemoveStream(rtc::scoped_refptr<MediaStreamInterface> stream) {
+ }
+ // Deprecated; please use the version that uses a scoped_refptr.
+ virtual void OnRemoveStream(MediaStreamInterface* stream) {}
- // Triggered when a remote peer open a data channel.
- virtual void OnDataChannel(DataChannelInterface* data_channel) = 0;
+ // Triggered when a remote peer opens a data channel.
+ virtual void OnDataChannel(
+ rtc::scoped_refptr<DataChannelInterface> data_channel){};
+ // Deprecated; please use the version that uses a scoped_refptr.
+ virtual void OnDataChannel(DataChannelInterface* data_channel) {}
- // Triggered when renegotiation is needed, for example the ICE has restarted.
+ // Triggered when renegotiation is needed. For example, an ICE restart
+ // has begun.
virtual void OnRenegotiationNeeded() = 0;
- // Called any time the IceConnectionState changes
+ // Called any time the IceConnectionState changes.
virtual void OnIceConnectionChange(
PeerConnectionInterface::IceConnectionState new_state) = 0;
- // Called any time the IceGatheringState changes
+ // Called any time the IceGatheringState changes.
virtual void OnIceGatheringChange(
PeerConnectionInterface::IceGatheringState new_state) = 0;
- // New Ice candidate have been found.
+ // A new ICE candidate has been gathered.
virtual void OnIceCandidate(const IceCandidateInterface* candidate) = 0;
// Ice candidates have been removed.