tor-browser

commit c612bb3e5a71038b9a03823d39cbd184037283f4
parent 409b5e4c4a7c1f4398cfb6e974f90c567a6459dd
Author: Dan Baker <dbaker@mozilla.com>
Date:   Mon,  1 Dec 2025 18:44:09 -0700

Bug 2000941 - Vendor libwebrtc from 5647f44199

Upstream commit: https://webrtc.googlesource.com/src/+/5647f44199a09c4d11fa783469ee5385d0aa3de2
    Remove the deprecated SdpDeserialize function

    This change removes the old SdpDeserialize function that took a
    JsepSessionDescription pointer as an output parameter.

    This function was marked as deprecated in favor of a newer overload that
    returns a std::unique_ptr<SessionDescriptionInterface>.

    Bug: webrtc:442220720
    Change-Id: Ic214168f2b3393ac69e4cab422c22622131cae89
    Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/408880
    Commit-Queue: Tomas Gunnarsson <tommi@webrtc.org>
    Reviewed-by: Harald Alvestrand <hta@webrtc.org>
    Cr-Commit-Position: refs/heads/main@{#45609}

Diffstat:
M
third_party/libwebrtc/README.mozilla.last-vendor
 | 
4
++--
M
third_party/libwebrtc/pc/webrtc_sdp.cc
 | 
51
---------------------------------------------------
M
third_party/libwebrtc/pc/webrtc_sdp.h
 | 
12
------------

3 files changed, 2 insertions(+), 65 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-02T01:41:05.910917+00:00.
+libwebrtc updated from /Users/danielbaker/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-12-02T01:43:50.785607+00:00.
 # base of lastest vendoring
-5d7e31cd07
+5647f44199
diff --git a/third_party/libwebrtc/pc/webrtc_sdp.cc b/third_party/libwebrtc/pc/webrtc_sdp.cc
@@ -3342,57 +3342,6 @@ std::string SdpSerializeCandidate(const Candidate& candidate) {
   return message;
 }
 
-bool SdpDeserialize(absl::string_view message,
-                    JsepSessionDescription* jdesc,
-                    SdpParseError* error) {
-  std::string session_id;
-  std::string session_version;
-  TransportDescription session_td("", "");
-  RtpHeaderExtensions session_extmaps;
-  SocketAddress session_connection_addr;
-  auto desc = std::make_unique<SessionDescription>();
-  size_t current_pos = 0;
-
-  // Session Description
-  if (!ParseSessionDescription(message, &current_pos, &session_id,
-                               &session_version, &session_td, &session_extmaps,
-                               &session_connection_addr, desc.get(), error)) {
-    return false;
-  }
-
-  // Media Description
-  std::vector<std::unique_ptr<IceCandidate>> candidates;
-  if (!ParseMediaDescription(message, session_td, session_extmaps, &current_pos,
-                             session_connection_addr, desc.get(), &candidates,
-                             error)) {
-    return false;
-  }
-
-#if RTC_DCHECK_IS_ON
-  // The current implementation of JsepSessionDescription::Initialize()
-  // does not check if Initialize() has been called before on the same
-  // object. The side effect of that can be that while the number of
-  // media sections may get trimmed from a previous size, there might
-  // also be left-over candidates from previous use of the
-  // JsepSessionDescription object. The Initialize() method is being
-  // deprecated, but this check is meant to help with catching situations
-  // when pre-existing candidates exist just before the candidates from
-  // the media description get added.
-  for (size_t i = 0u; i < jdesc->number_of_mediasections(); ++i) {
-    RTC_DCHECK(jdesc->candidates(i)->empty());
-  }
-#endif
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-  jdesc->Initialize(std::move(desc), session_id, session_version);
-#pragma clang diagnostic pop
-
-  for (const auto& candidate : candidates) {
-    jdesc->AddCandidate(candidate.get());
-  }
-  return true;
-}
-
 std::unique_ptr<SessionDescriptionInterface> SdpDeserialize(
     SdpType sdp_type,
     absl::string_view message,
diff --git a/third_party/libwebrtc/pc/webrtc_sdp.h b/third_party/libwebrtc/pc/webrtc_sdp.h
@@ -51,18 +51,6 @@ std::string SdpSerializeCandidate(const IceCandidate& candidate);
 // candidate - The candidate to be serialized.
 RTC_EXPORT std::string SdpSerializeCandidate(const Candidate& candidate);
 
-// Deserializes the passed in SDP string to a JsepSessionDescription.
-// message - SDP string to be Deserialized.
-// jdesc - The JsepSessionDescription deserialized from the SDP string.
-// error - The detail error information when parsing fails.
-// return - true on success, false on failure.
-[[deprecated(
-    "Instead, use the SdpDeserialize() method that requires an SdpType and "
-    "returns std::unique_ptr<SessionDescriptionInterface>.")]]
-bool SdpDeserialize(absl::string_view message,
-                    JsepSessionDescription* jdesc,
-                    SdpParseError* error);
-
 // Deserializes the `sdp` to construct a SessionDescriptionInterface object.
 // sdp_type - The type of session description object that should be constructed.
 // sdp - The SDP string to be Deserialized.