commit e1da6c9ca30bfa4f782c2970a137887dd84e5348
parent 40eb3dcbb758d2f700868ff3b547c442424da15c
Author: Dan Baker <dbaker@mozilla.com>
Date: Mon, 1 Dec 2025 20:21:49 -0700
Bug 2000941 - Vendor libwebrtc from e7fef8d7e8
Upstream commit: https://webrtc.googlesource.com/src/+/e7fef8d7e82456764a16d1dde84e5a4af9281a55
Remove RemoveIceCandidates
Bug: webrtc:8395
Fixes: webrtc:8395
Change-Id: Ie5b538cc3acd8f854e9c284071f2f72329cbc3e8
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/409240
Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
Commit-Queue: Tomas Gunnarsson <tommi@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#45643}
Diffstat:
8 files changed, 2 insertions(+), 52 deletions(-)
diff --git a/third_party/libwebrtc/README.mozilla.last-vendor b/third_party/libwebrtc/README.mozilla.last-vendor
@@ -1,4 +1,4 @@
# ./mach python dom/media/webrtc/third_party_build/vendor-libwebrtc.py --from-local /Users/danielbaker/elm/.moz-fast-forward/moz-libwebrtc --commit mozpatches libwebrtc
-libwebrtc updated from /Users/danielbaker/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-12-02T03:19:14.627909+00:00.
+libwebrtc updated from /Users/danielbaker/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-12-02T03:21:36.467706+00:00.
# base of lastest vendoring
-d84244418e
+e7fef8d7e8
diff --git a/third_party/libwebrtc/api/peer_connection_interface.cc b/third_party/libwebrtc/api/peer_connection_interface.cc
@@ -63,11 +63,4 @@ PeerConnectionFactoryDependencies::PeerConnectionFactoryDependencies(
PeerConnectionFactoryDependencies::~PeerConnectionFactoryDependencies() =
default;
-// deprecated, only implemented to make derived classes simpler.
-bool PeerConnectionInterface::RemoveIceCandidates(
- const std::vector<Candidate>& candidates) {
- RTC_CHECK_NOTREACHED();
- return false;
-}
-
} // namespace webrtc
diff --git a/third_party/libwebrtc/api/peer_connection_interface.h b/third_party/libwebrtc/api/peer_connection_interface.h
@@ -1126,15 +1126,6 @@ class RTC_EXPORT PeerConnectionInterface : public RefCountInterface {
std::function<void(RTCError)> callback) {}
virtual bool RemoveIceCandidate(const IceCandidate* candidate) = 0;
- // Removes a group of remote candidates from the ICE agent. Needed mainly for
- // continual gathering, to avoid an ever-growing list of candidates as
- // networks come and go. Note that the candidates' transport_name must be set
- // to the MID of the m= section that generated the candidate.
- // TODO(bugs.webrtc.org/8395): Use IceCandidate instead of
- // Candidate, which would avoid the transport_name oddity.
- [[deprecated("Use IceCandidate version")]] virtual bool RemoveIceCandidates(
- const std::vector<Candidate>& candidates);
-
// SetBitrate limits the bandwidth allocated for all RTP streams sent by
// this PeerConnection. Other limitations might affect these limits and
// are respected (for example "b=AS" in SDP).
diff --git a/third_party/libwebrtc/pc/peer_connection.cc b/third_party/libwebrtc/pc/peer_connection.cc
@@ -1581,13 +1581,6 @@ bool PeerConnection::RemoveIceCandidate(const IceCandidate* candidate) {
return sdp_handler_->RemoveIceCandidate(candidate);
}
-bool PeerConnection::RemoveIceCandidates(
- const std::vector<Candidate>& candidates) {
- TRACE_EVENT0("webrtc", "PeerConnection::RemoveIceCandidates");
- RTC_DCHECK_RUN_ON(signaling_thread());
- return sdp_handler_->RemoveIceCandidates(candidates);
-}
-
RTCError PeerConnection::SetBitrate(const BitrateSettings& bitrate) {
if (!worker_thread()->IsCurrent()) {
return worker_thread()->BlockingCall([&]() { return SetBitrate(bitrate); });
diff --git a/third_party/libwebrtc/pc/peer_connection.h b/third_party/libwebrtc/pc/peer_connection.h
@@ -237,7 +237,6 @@ class PeerConnection : public PeerConnectionInternal,
void AddIceCandidate(std::unique_ptr<IceCandidate> candidate,
std::function<void(RTCError)> callback) override;
bool RemoveIceCandidate(const IceCandidate* candidate) override;
- bool RemoveIceCandidates(const std::vector<Candidate>& candidates) override;
RTCError SetBitrate(const BitrateSettings& bitrate) override;
void ReconfigureBandwidthEstimation(
diff --git a/third_party/libwebrtc/pc/peer_connection_proxy.h b/third_party/libwebrtc/pc/peer_connection_proxy.h
@@ -159,10 +159,6 @@ PROXY_METHOD2(void,
std::unique_ptr<IceCandidate>,
std::function<void(RTCError)>)
PROXY_METHOD1(bool, RemoveIceCandidate, const IceCandidate*)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-PROXY_METHOD1(bool, RemoveIceCandidates, const std::vector<Candidate>&)
-#pragma clang diagnostic pop
PROXY_METHOD1(RTCError, SetBitrate, const BitrateSettings&)
PROXY_METHOD1(void,
ReconfigureBandwidthEstimation,
diff --git a/third_party/libwebrtc/pc/sdp_offer_answer.cc b/third_party/libwebrtc/pc/sdp_offer_answer.cc
@@ -3001,27 +3001,6 @@ bool SdpOfferAnswerHandler::RemoveIceCandidate(const IceCandidate* candidate) {
return removed;
}
-bool SdpOfferAnswerHandler::RemoveIceCandidates(
- const std::vector<Candidate>& candidates) {
- TRACE_EVENT0("webrtc", "SdpOfferAnswerHandler::RemoveIceCandidates");
- RTC_DCHECK_RUN_ON(signaling_thread());
-
- for (const auto& c : candidates) {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- IceCandidate candidate(c.transport_name(), /*sdp_mline_index=*/-1, c);
-#pragma clang diagnostic pop
- if (!RemoveIceCandidate(&candidate)) {
- RTC_LOG(LS_ERROR) << "RemoveIceCandidates: Failed to remove candidate: "
- << c.ToSensitiveString();
- }
- }
-
- // Technically it would be more correct to return `number_removed != 0u` here,
- // but some downstream code needs to be updated first.
- return true;
-}
-
void SdpOfferAnswerHandler::AddLocalIceCandidate(
const IceCandidate* candidate) {
RTC_DCHECK_RUN_ON(signaling_thread());
diff --git a/third_party/libwebrtc/pc/sdp_offer_answer.h b/third_party/libwebrtc/pc/sdp_offer_answer.h
@@ -151,7 +151,6 @@ class SdpOfferAnswerHandler : public SdpStateProvider {
void AddIceCandidate(std::unique_ptr<IceCandidate> candidate,
std::function<void(RTCError)> callback);
bool RemoveIceCandidate(const IceCandidate* candidate);
- bool RemoveIceCandidates(const std::vector<Candidate>& candidates);
// Adds a locally generated candidate to the local description.
void AddLocalIceCandidate(const IceCandidate* candidate);
void RemoveLocalIceCandidates(absl::string_view mid,
