commit b1994724aafb3d09ff1c6eb8796374b13753ea1c
parent 09719747b70c9cfe02f732cc47431c8e920b2bb0
Author: Dan Baker <dbaker@mozilla.com>
Date: Mon, 27 Oct 2025 14:07:33 -0600
Bug 1995393 - Vendor libwebrtc from f27f53484e
Upstream commit: https://webrtc.googlesource.com/src/+/f27f53484eefa9a9a84371aeef01748b21b0a4b7
Fix declarations that change meaning inside class
According to the C++20 standard [6.4.7], names used inside classes must
refer to the same declaration when re-evaluated in the class scope.
This means that we have to qualify types that use the same names as the
virtual methods.
Bug: webrtc:439743504
Change-Id: I1921b35ec1e3dde02aef098ada427c3cd865c64e
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/405100
Reviewed-by: Per Kjellander <perkj@webrtc.org>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Auto-Submit: Marcin Serwin <marcinserwin@google.com>
Reviewed-by: Magnus Flodman <mflodman@webrtc.org>
Commit-Queue: Marcin Serwin <marcinserwin@google.com>
Cr-Commit-Position: refs/heads/main@{#45452}
Diffstat:
4 files changed, 9 insertions(+), 12 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-27T20:05:11.729217+00:00.
+libwebrtc updated from /Users/danielbaker/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-10-27T20:07:16.650479+00:00.
# base of lastest vendoring
-a60b9a4162
+f27f53484e
diff --git a/third_party/libwebrtc/p2p/base/port_interface.h b/third_party/libwebrtc/p2p/base/port_interface.h
@@ -55,7 +55,7 @@ class PortInterface {
virtual ~PortInterface();
virtual IceCandidateType Type() const = 0;
- virtual const Network* Network() const = 0;
+ virtual const ::webrtc::Network* Network() const = 0;
// Methods to set/get ICE role and tiebreaker values.
virtual void SetIceRole(IceRole role) = 0;
@@ -205,5 +205,4 @@ class PortInterface {
} // namespace webrtc
-
#endif // P2P_BASE_PORT_INTERFACE_H_
diff --git a/third_party/libwebrtc/pc/codec_vendor.h b/third_party/libwebrtc/pc/codec_vendor.h
@@ -119,7 +119,7 @@ class CodecVendor {
class CodecLookupHelper {
public:
virtual ~CodecLookupHelper() = default;
- virtual PayloadTypeSuggester* PayloadTypeSuggester() = 0;
+ virtual ::webrtc::PayloadTypeSuggester* PayloadTypeSuggester() = 0;
// Look up the codec vendor to use, depending on context.
// This call may get additional arguments in the future, to aid
// in selection of the correct context.
@@ -128,5 +128,4 @@ class CodecLookupHelper {
} // namespace webrtc
-
#endif // PC_CODEC_VENDOR_H_
diff --git a/third_party/libwebrtc/pc/jsep_transport.h b/third_party/libwebrtc/pc/jsep_transport.h
@@ -115,14 +115,12 @@ class JsepTransport {
}
RTCError SetLocalJsepTransportDescription(
- const JsepTransportDescription& jsep_description,
- SdpType type);
+ const JsepTransportDescription& jsep_description, SdpType type);
// Set the remote TransportDescription to be used by DTLS and ICE channels
// that are part of this Transport.
RTCError SetRemoteJsepTransportDescription(
- const JsepTransportDescription& jsep_description,
- SdpType type);
+ const JsepTransportDescription& jsep_description, SdpType type);
RTCError AddRemoteCandidates(const Candidates& candidates);
// Set the "needs-ice-restart" flag as described in JSEP. After the flag is
@@ -204,7 +202,9 @@ class JsepTransport {
return rtp_dtls_transport_;
}
- scoped_refptr<SctpTransport> SctpTransport() const { return sctp_transport_; }
+ scoped_refptr<::webrtc::SctpTransport> SctpTransport() const {
+ return sctp_transport_;
+ }
// TODO(bugs.webrtc.org/9719): Delete method, update callers to use
// SctpTransport() instead.
@@ -329,5 +329,4 @@ class JsepTransport {
} // namespace webrtc
-
#endif // PC_JSEP_TRANSPORT_H_
