#528 auto-rebase for 119.0.6045.160

Auto-rebase for 119.0.6045.160
uazo · Nov 15, 2023 · dcbb3d0 · dcbb3d0
2 parents d4b843e + a2b0b9a
commit dcbb3d0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/build/patches/00Disable-speechSynthesis-getVoices-API.patch b/build/patches/00Disable-speechSynthesis-getVoices-API.patch
@@ -90,7 +90,7 @@ diff --git a/components/content_settings/renderer/content_settings_agent_impl.h
 diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc
 --- a/media/base/media_switches.cc
 +++ b/media/base/media_switches.cc
-@@ -920,7 +920,7 @@ const base::FeatureParam<std::string> kMediaFoundationClearKeyCdmPathForTesting{
+@@ -919,7 +919,7 @@ const base::FeatureParam<std::string> kMediaFoundationClearKeyCdmPathForTesting{
  #endif  // BUILDFLAG(IS_WIN)
 
  // Enables the Live Caption feature on supported devices.
@@ -99,7 +99,7 @@ diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc
 
  // Controls whether a "Share this tab instead" button should be shown for
  // getDisplayMedia captures. Note: This flag does not control if the "Share this
-@@ -979,9 +979,9 @@ BASE_FEATURE(kLiveCaptionRightClick,
+@@ -978,9 +978,9 @@ BASE_FEATURE(kLiveCaptionRightClick,
               base::FEATURE_DISABLED_BY_DEFAULT);
 
  // Enable or disable Live Caption support for WebAudio.

diff --git a/build/patches/AImageReader-CFI-crash-mitigations.patch b/build/patches/AImageReader-CFI-crash-mitigations.patch
@@ -233,7 +233,7 @@ diff --git a/gpu/ipc/service/stream_texture_android.cc b/gpu/ipc/service/stream_
 diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc
 --- a/media/base/media_switches.cc
 +++ b/media/base/media_switches.cc
-@@ -1023,6 +1023,11 @@ BASE_FEATURE(kHardwareSecureDecryptionExperiment,
+@@ -1022,6 +1022,11 @@ BASE_FEATURE(kHardwareSecureDecryptionExperiment,
  // Allows automatically disabling hardware secure Content Decryption Module
  // (CDM) after failures or crashes to fallback to software secure CDMs. If this
  // feature is disabled, the fallback will never happen and users could be stuck

diff --git a/build/patches/Disable-DRM-media-origin-IDs-preprovisioning.patch b/build/patches/Disable-DRM-media-origin-IDs-preprovisioning.patch
@@ -10,7 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc
 --- a/media/base/media_switches.cc
 +++ b/media/base/media_switches.cc
-@@ -1136,8 +1136,8 @@ BASE_FEATURE(kMediaDrmPersistentLicense,
+@@ -1135,8 +1135,8 @@ BASE_FEATURE(kMediaDrmPersistentLicense,
  // MediaDrmBridge. If disabled, MediaDrmBridge will get unprovisioned origin IDs
  // which will trigger provisioning process after MediaDrmBridge is created.
  BASE_FEATURE(kMediaDrmPreprovisioning,