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

Remove IceTransportInternal::SignalGatheringState

Browse Source 
Landing when last remaining usage in Chrome has been removed.

Bug: webrtc:11943
Change-Id: I62817e2cc0b67113126b82424b6f843c77e66f31
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/341001
Reviewed-by: Per Kjellander <perkj@webrtc.org>
Commit-Queue: Harald Alvestrand <hta@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#42157}
This commit is contained in:
Harald Alvestrand 2024-04-23 14:47:21 +00:00 committed by WebRTC LUCI CQ
parent f1847a101d
commit 4fc23457aa
2 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
p2p/base/ice_transport_internal.cc
View File

@ -123,13 +123,7 @@ int IceConfig::stun_keepalive_interval_or_default() const {
return stun_keepalive_interval.value_or(STUN_KEEPALIVE_INTERVAL); return stun_keepalive_interval.value_or(STUN_KEEPALIVE_INTERVAL);
} }
IceTransportInternal::IceTransportInternal() { IceTransportInternal::IceTransportInternal() {}
// Set up detector for use of SignalGatheringState rather than
// SetGatheringStateCallback, and behave accordingly
// TODO(bugs.webrtc.org/11943): remove when Signal removed
SignalGatheringState.connect(
this, &IceTransportInternal::SignalGatheringStateFired);
}
IceTransportInternal::~IceTransportInternal() = default; IceTransportInternal::~IceTransportInternal() = default;

13
p2p/base/ice_transport_internal.h
View File

@ -304,9 +304,6 @@ class RTC_EXPORT IceTransportInternal : public rtc::PacketTransportInternal {
return absl::nullopt; return absl::nullopt;
} }
// Signal Exposed for backwards compatibility.
sigslot::signal1<IceTransportInternal*> SignalGatheringState;
// Note: These calls must not be inlined in order to avoid linking issues.
void AddGatheringStateCallback( void AddGatheringStateCallback(
const void* removal_tag, const void* removal_tag,
absl::AnyInvocable<void(IceTransportInternal*)> callback); absl::AnyInvocable<void(IceTransportInternal*)> callback);
@ -384,7 +381,9 @@ class RTC_EXPORT IceTransportInternal : public rtc::PacketTransportInternal {
} }
protected: protected:
void SendGatheringStateEvent() { SignalGatheringState(this); } void SendGatheringStateEvent() {
gathering_state_callback_list_.Send(this);
}
webrtc::CallbackList<IceTransportInternal*, webrtc::CallbackList<IceTransportInternal*,
const StunDictionaryView&, const StunDictionaryView&,
@ -403,12 +402,6 @@ class RTC_EXPORT IceTransportInternal : public rtc::PacketTransportInternal {
absl::AnyInvocable<void(const cricket::CandidatePairChangeEvent&)> absl::AnyInvocable<void(const cricket::CandidatePairChangeEvent&)>
candidate_pair_change_callback_; candidate_pair_change_callback_;
private:
// TODO(bugs.webrtc.org/11943): remove when removing Signal
void SignalGatheringStateFired(IceTransportInternal* transport) {
gathering_state_callback_list_.Send(transport);
}
}; };
} // namespace cricket } // namespace cricket