commit a01111c9c7b41e4dc8fa5ce74d3c129a088df9ad parent 54e9f81911d98937708b4dd09ada5cd01df68b3f Author: Dan Baker <dbaker@mozilla.com> Date: Mon, 27 Oct 2025 15:42:20 -0600 Bug 1995393 - Vendor libwebrtc from ee35d408e9 Upstream commit: https://webrtc.googlesource.com/src/+/ee35d408e9edbb94151d4167571d7e0e2e1a2a1d register callback list to a sigslot candidate ready signal in Port ctor once Bug: webrtc:42222066 Change-Id: I43acedebd25c20169b34e97b3ef5e21041f3d79f Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/406760 Reviewed-by: Harald Alvestrand <hta@webrtc.org> Reviewed-by: Tomas Gunnarsson <tommi@webrtc.org> Commit-Queue: Lena Kaplan <lenakaplan@meta.com> Cr-Commit-Position: refs/heads/main@{#45495} Diffstat:
4 files changed, 10 insertions(+), 10 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-10-27T21:40:06.728038+00:00. +libwebrtc updated from /Users/danielbaker/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-10-27T21:42:08.429710+00:00. # base of lastest vendoring -b12e03f767 +ee35d408e9 diff --git a/third_party/libwebrtc/p2p/base/port.cc b/third_party/libwebrtc/p2p/base/port.cc @@ -148,6 +148,12 @@ Port::Port(const PortParametersRef& args, PostDestroyIfDead(/*delayed=*/true); RTC_LOG(LS_INFO) << ToString() << ": Port created with network cost " << network_cost_; + + // This is a temporary solution to support SignalCandidateReady signals from + // downstream. We also register a method to send the callbacks in callback + // list. This will no longer be needed once downstream stops using + // SignalCandidateReady. + SignalCandidateReady.connect(this, &Port::SendCandidateReadyCallbackList); } Port::~Port() { diff --git a/third_party/libwebrtc/p2p/base/port.h b/third_party/libwebrtc/p2p/base/port.h @@ -276,8 +276,6 @@ class RTC_EXPORT Port : public PortInterface, public sigslot::has_slots<> { // callback list. The signal can be deleted once all downstream usages are // replaced with the new CallbackList implementation. sigslot::signal2<Port*, const Candidate&> SignalCandidateReady; - void SendCandidateReadyCallbackList(Port*, const Candidate&); - // Provides all of the above information in one handy object. const std::vector<Candidate>& Candidates() const override; // Fired when candidate discovery failed using certain server. @@ -516,6 +514,8 @@ class RTC_EXPORT Port : public PortInterface, public sigslot::has_slots<> { absl::AnyInvocable<void(LocalNetworkAccessPermissionStatus)> callback, LocalNetworkAccessPermissionStatus status); + void SendCandidateReadyCallbackList(Port*, const Candidate&); + const Environment env_; TaskQueueBase* const thread_; PacketSocketFactory* const factory_; diff --git a/third_party/libwebrtc/p2p/client/basic_port_allocator.cc b/third_party/libwebrtc/p2p/client/basic_port_allocator.cc @@ -920,12 +920,6 @@ void BasicPortAllocatorSession::AddAllocatedPort(Port* port, PortData data(port, seq); ports_.push_back(data); - // This is a temporary solution to support SignalCandidateReady signals from - // downstream. We also register a method to send the callbacks in callback - // list. This will no longer be needed once downstream stops using - // SignalCandidateReady. - port->SignalCandidateReady.connect(port, - &Port::SendCandidateReadyCallbackList); port->SubscribeCandidateReadyCallback( [this](Port* port, const Candidate& c) { OnCandidateReady(port, c); }); port->SubscribeCandidateError(