tor-browser

commit e99fac102f09c6953467305a89cdf14be8cd314a
parent 373162d5be83aff736c3c6288a76d964825934f0
Author: Michael Froman <mfroman@mozilla.com>
Date:   Wed, 15 Oct 2025 11:46:28 -0500

Bug 1993083 - Vendor libwebrtc from d626ae789d

Upstream commit: https://webrtc.googlesource.com/src/+/d626ae789d347b665749f66a769f0c73bfa64b2a
    [fuchsia][sysmem2] switch to sysmem2 token

    Now that RegisterBufferCollectionArgs can carry a sysmem2 token,
    avoid a token conversion.

    Bug: b/306258175
    Change-Id: Icc675d1d11cecce821a771c149bea988b2d341a9
    Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/382862
    Commit-Queue: Dustin Green <dustingreen@google.com>
    Reviewed-by: Mark Foltz <mfoltz@chromium.org>
    Reviewed-by: Alexander Cooper <alcooper@chromium.org>
    Cr-Commit-Position: refs/heads/main@{#45265}

Diffstat:
M
third_party/libwebrtc/README.mozilla.last-vendor
 | 
4
++--
M
third_party/libwebrtc/modules/desktop_capture/screen_capturer_fuchsia.cc
 | 
5
++---

2 files changed, 4 insertions(+), 5 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 /home/mfroman/mozilla/elm/.moz-fast-forward/moz-libwebrtc --commit mozpatches libwebrtc
-libwebrtc updated from /home/mfroman/mozilla/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-10-15T16:45:02.948456+00:00.
+libwebrtc updated from /home/mfroman/mozilla/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-10-15T16:46:18.960368+00:00.
 # base of lastest vendoring
-59927374f1
+d626ae789d
diff --git a/third_party/libwebrtc/modules/desktop_capture/screen_capturer_fuchsia.cc b/third_party/libwebrtc/modules/desktop_capture/screen_capturer_fuchsia.cc
@@ -303,9 +303,8 @@ void ScreenCapturerFuchsia::SetupBuffers() {
 
   fuchsia::ui::composition::RegisterBufferCollectionArgs buffer_collection_args;
   buffer_collection_args.set_export_token(std::move(export_token));
-  buffer_collection_args.set_buffer_collection_token(
-      fuchsia::sysmem::BufferCollectionTokenHandle(
-          flatland_token.Unbind().TakeChannel()));
+  buffer_collection_args.set_buffer_collection_token2(
+      std::move(flatland_token));
   buffer_collection_args.set_usage(
       fuchsia::ui::composition::RegisterBufferCollectionUsage::SCREENSHOT);