tor-browser

commit 22ff1c51585f4ef42c90499d1b05a06419aa20c4
parent 86e89286a5a64899e5c7207dc3642a50b9b3d94b
Author: Dan Baker <dbaker@mozilla.com>
Date:   Mon,  1 Dec 2025 22:35:03 -0700

Bug 2000941 - Vendor libwebrtc from 368088b16d

Upstream commit: https://webrtc.googlesource.com/src/+/368088b16dfd055eb2248aa0d9dbad2f3be8cd47
    Remove deprecated jni_zero constructor usage in sdk/android

    Some jni_zero constructors have been deprecated and restricted to
    protected, except for WebRTC Android, which defines the
    JNI_ZERO_ENABLE_COMPAT_API macro.

    This change removes deprecated jni_zero usage in sdk/android, preparing
    the codebase for the eventual removal of the JNI_ZERO_ENABLE_COMPAT_API
    macro.

    Bug: chromium:40173007
    Change-Id: Ib454538bec298911cdc617572b3e6c9f0ef30b10
    Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/409500
    Reviewed-by: Erik Språng <sprang@webrtc.org>
    Reviewed-by: Zoé Lepaul <zlep@webrtc.org>
    Commit-Queue: Erik Språng <sprang@webrtc.org>
    Auto-Submit: Daniel.L (Byoungchan) Lee <daniel.l@hpcnt.com>
    Cr-Commit-Position: refs/heads/main@{#45695}

Diffstat:
M
third_party/libwebrtc/README.mozilla.last-vendor
 | 
4
++--
M
third_party/libwebrtc/modules/video_coding/codecs/test/android_codec_factory_helper.cc
 | 
18
++++++++++--------

2 files changed, 12 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-12-02T05:31:18.899684+00:00.
+libwebrtc updated from /Users/danielbaker/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-12-02T05:34:49.189583+00:00.
 # base of lastest vendoring
-d3fcfe01c9
+368088b16d
diff --git a/third_party/libwebrtc/modules/video_coding/codecs/test/android_codec_factory_helper.cc b/third_party/libwebrtc/modules/video_coding/codecs/test/android_codec_factory_helper.cc
@@ -57,11 +57,12 @@ std::unique_ptr<VideoEncoderFactory> CreateAndroidEncoderFactory() {
       GetClass(env, "org/webrtc/HardwareVideoEncoderFactory");
   jmethodID factory_constructor = env->GetMethodID(
       factory_class.obj(), "<init>", "(Lorg/webrtc/EglBase$Context;ZZ)V");
-  ScopedJavaLocalRef<jobject> factory_object(
-      env, env->NewObject(factory_class.obj(), factory_constructor,
-                          nullptr /* shared_context */,
-                          false /* enable_intel_vp8_encoder */,
-                          true /* enable_h264_high_profile */));
+  ScopedJavaLocalRef<jobject> factory_object =
+      ScopedJavaLocalRef<jobject>::Adopt(
+          env, env->NewObject(factory_class.obj(), factory_constructor,
+                              nullptr /* shared_context */,
+                              false /* enable_intel_vp8_encoder */,
+                              true /* enable_h264_high_profile */));
   return JavaToNativeVideoEncoderFactory(env, factory_object.obj());
 }
 
@@ -71,9 +72,10 @@ std::unique_ptr<VideoDecoderFactory> CreateAndroidDecoderFactory() {
       GetClass(env, "org/webrtc/HardwareVideoDecoderFactory");
   jmethodID factory_constructor = env->GetMethodID(
       factory_class.obj(), "<init>", "(Lorg/webrtc/EglBase$Context;)V");
-  ScopedJavaLocalRef<jobject> factory_object(
-      env, env->NewObject(factory_class.obj(), factory_constructor,
-                          nullptr /* shared_context */));
+  ScopedJavaLocalRef<jobject> factory_object =
+      ScopedJavaLocalRef<jobject>::Adopt(
+          env, env->NewObject(factory_class.obj(), factory_constructor,
+                              nullptr /* shared_context */));
   return JavaToNativeVideoDecoderFactory(env, factory_object.obj());
 }