tor-browser

commit b6dfe0576fc92b06f7df635f59f2dcca0200006f
parent 0c8b71bc292991d66d9a17875d8308e4f96338db
Author: Makoto Kato <m_kato@ga2.so-net.ne.jp>
Date:   Wed, 29 Oct 2025 11:27:36 +0000

Bug 1996275 - Remove FEATURE_STAGEFRIGHT that is unused. r=media-playback-reviewers,gfx-reviewers,geckoview-reviewers,alwu,ohall,nical

OMX plugin for Android was removed by bug 1379190, so
`FEATURE_STAGEFRIGHT` is also no longer used now.

Differential Revision: https://phabricator.services.mozilla.com/D270082

Diffstat:
M
widget/GfxInfoFeatureDefs.h
 | 
4
++--
M
widget/android/GfxInfo.cpp
 | 
74
--------------------------------------------------------------------------

2 files changed, 2 insertions(+), 76 deletions(-)
diff --git a/widget/GfxInfoFeatureDefs.h b/widget/GfxInfoFeatureDefs.h
@@ -27,8 +27,8 @@ GFXINFO_FEATURE(WEBGL_OPENGL, "WEBGL_OPENGL", "webgl.opengl")
 GFXINFO_FEATURE(WEBGL_ANGLE, "WEBGL_ANGLE", "webgl.angle")
 /* (Unused) Whether WebGL antialiasing is supported. */
 GFXINFO_FEATURE(UNUSED_WEBGL_MSAA, "WEBGL_MSAA", "webgl.msaa")
-/* Whether Stagefright is supported, starting in 17. */
-GFXINFO_FEATURE(STAGEFRIGHT, "STAGEFRIGHT", "stagefright")
+/* (Unused) Whether Stagefright is supported, starting in 17. */
+GFXINFO_FEATURE(UNUSED_STAGEFRIGHT, "STAGEFRIGHT", "stagefright")
 /* Whether Webrtc Hardware H.264 acceleration is supported, starting in 71. */
 GFXINFO_FEATURE(WEBRTC_HW_ACCELERATION_H264, "WEBRTC_HW_ACCELERATION_H264", "webrtc.hw.acceleration.h264")
 /* Whether Direct3D 11 is supported for layers, starting in 32. */
diff --git a/widget/android/GfxInfo.cpp b/widget/android/GfxInfo.cpp
@@ -429,80 +429,6 @@ nsresult GfxInfo::GetFeatureStatusImpl(
       }
     }
 
-    if (aFeature == FEATURE_STAGEFRIGHT) {
-      NS_LossyConvertUTF16toASCII cManufacturer(mManufacturer);
-      NS_LossyConvertUTF16toASCII cModel(mModel);
-      NS_LossyConvertUTF16toASCII cHardware(mHardware);
-
-      if (cHardware.EqualsLiteral("antares") ||
-          cHardware.EqualsLiteral("harmony") ||
-          cHardware.EqualsLiteral("picasso") ||
-          cHardware.EqualsLiteral("picasso_e") ||
-          cHardware.EqualsLiteral("ventana") ||
-          cHardware.EqualsLiteral("rk30board")) {
-        *aStatus = nsIGfxInfo::FEATURE_BLOCKED_DEVICE;
-        aFailureId = "FEATURE_FAILURE_STAGE_HW";
-        return NS_OK;
-      }
-
-      if (CompareVersions(mOSVersion.get(), "4.1.0") < 0) {
-        // Whitelist:
-        //   All Samsung ICS devices, except for:
-        //     Samsung SGH-I717 (Bug 845729)
-        //     Samsung SGH-I727 (Bug 845729)
-        //     Samsung SGH-I757 (Bug 845729)
-        //   All Galaxy nexus ICS devices
-        //   Sony Xperia Ion (LT28) ICS devices
-        bool isWhitelisted =
-            cModel.Equals("LT28h", nsCaseInsensitiveCStringComparator) ||
-            cManufacturer.Equals("samsung",
-                                 nsCaseInsensitiveCStringComparator) ||
-            cModel.Equals(
-                "galaxy nexus",
-                nsCaseInsensitiveCStringComparator);  // some Galaxy Nexus
-                                                      // have
-                                                      // manufacturer=amazon
-
-        if (cModel.LowerCaseFindASCII("sgh-i717") != -1 ||
-            cModel.LowerCaseFindASCII("sgh-i727") != -1 ||
-            cModel.LowerCaseFindASCII("sgh-i757") != -1) {
-          isWhitelisted = false;
-        }
-
-        if (!isWhitelisted) {
-          *aStatus = nsIGfxInfo::FEATURE_BLOCKED_DEVICE;
-          aFailureId = "FEATURE_FAILURE_4_1_HW";
-          return NS_OK;
-        }
-      } else if (CompareVersions(mOSVersion.get(), "4.2.0") < 0) {
-        // Whitelist:
-        //   All JB phones except for those in blocklist below
-        // Blocklist:
-        //   Samsung devices from bug 812881 and 853522.
-        //   Motorola XT890 from bug 882342.
-        bool isBlocklisted = cModel.LowerCaseFindASCII("gt-p3100") != -1 ||
-                             cModel.LowerCaseFindASCII("gt-p3110") != -1 ||
-                             cModel.LowerCaseFindASCII("gt-p3113") != -1 ||
-                             cModel.LowerCaseFindASCII("gt-p5100") != -1 ||
-                             cModel.LowerCaseFindASCII("gt-p5110") != -1 ||
-                             cModel.LowerCaseFindASCII("gt-p5113") != -1 ||
-                             cModel.LowerCaseFindASCII("xt890") != -1;
-
-        if (isBlocklisted) {
-          *aStatus = nsIGfxInfo::FEATURE_BLOCKED_DEVICE;
-          aFailureId = "FEATURE_FAILURE_4_2_HW";
-          return NS_OK;
-        }
-      } else if (CompareVersions(mOSVersion.get(), "4.3.0") < 0) {
-        // Blocklist all Sony devices
-        if (cManufacturer.LowerCaseFindASCII("sony") != -1) {
-          *aStatus = nsIGfxInfo::FEATURE_BLOCKED_DEVICE;
-          aFailureId = "FEATURE_FAILURE_4_3_SONY";
-          return NS_OK;
-        }
-      }
-    }
-
     if (aFeature == FEATURE_WEBRTC_HW_ACCELERATION_ENCODE) {
       if (jni::IsAvailable()) {
         *aStatus = WebRtcHwVp8EncodeSupported();