AUTOMATED - git apply results

uazo · Apr 17, 2024 · f45d4ed · f45d4ed
1 parent 8ae8389
commit f45d4ed
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 9 deletions.
diff --git a/build/patches/Add-cromite-flags-support.patch b/build/patches/Add-cromite-flags-support.patch
@@ -1722,7 +1722,7 @@ diff --git a/services/network/public/cpp/features.h b/services/network/public/cp
 diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc
 --- a/third_party/blink/common/features.cc
 +++ b/third_party/blink/common/features.cc
-@@ -2596,5 +2596,6 @@ BASE_FEATURE(kNoThrottlingVisibleAgent,
+@@ -2601,5 +2601,6 @@ BASE_FEATURE(kNoThrottlingVisibleAgent,
               "NoThrottlingVisibleAgent",
               base::FEATURE_DISABLED_BY_DEFAULT);
 
@@ -1732,7 +1732,7 @@ diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/fea
 diff --git a/third_party/blink/public/common/features.h b/third_party/blink/public/common/features.h
 --- a/third_party/blink/public/common/features.h
 +++ b/third_party/blink/public/common/features.h
-@@ -1681,6 +1681,7 @@ BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(
+@@ -1682,6 +1682,7 @@ BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(
  // Don't throttle frames that are same-agent with with a visible frame.
  BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kNoThrottlingVisibleAgent);
 

diff --git a/build/patches/AudioBuffer-AnalyserNode-fp-mitigations.patch b/build/patches/AudioBuffer-AnalyserNode-fp-mitigations.patch
@@ -87,15 +87,15 @@ diff --git a/third_party/blink/renderer/modules/webaudio/audio_buffer.h b/third_
 diff --git a/third_party/blink/renderer/modules/webaudio/audio_context.cc b/third_party/blink/renderer/modules/webaudio/audio_context.cc
 --- a/third_party/blink/renderer/modules/webaudio/audio_context.cc
 +++ b/third_party/blink/renderer/modules/webaudio/audio_context.cc
-@@ -11,6 +11,7 @@
- #include "services/metrics/public/cpp/ukm_recorder.h"
+@@ -12,6 +12,7 @@
  #include "third_party/blink/public/common/browser_interface_broker_proxy.h"
+ #include "third_party/blink/public/common/features.h"
  #include "third_party/blink/public/common/mediastream/media_devices.h"
 +#include "third_party/blink/public/common/features.h"
  #include "third_party/blink/public/platform/modules/webrtc/webrtc_logging.h"
  #include "third_party/blink/public/platform/web_audio_latency_hint.h"
  #include "third_party/blink/renderer/bindings/core/v8/script_promise_resolver.h"
-@@ -586,7 +587,9 @@ double AudioContext::baseLatency() const {
+@@ -587,7 +588,9 @@ double AudioContext::baseLatency() const {
    DCHECK(IsMainThread());
    DCHECK(destination());
 

diff --git a/build/patches/Disable-FLoC-and-privacy-sandbox.patch b/build/patches/Disable-FLoC-and-privacy-sandbox.patch
@@ -228,7 +228,7 @@ new file mode 100644
 diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc
 --- a/third_party/blink/common/features.cc
 +++ b/third_party/blink/common/features.cc
-@@ -2514,6 +2514,7 @@ bool IsAllowPageWithIDBConnectionAndTransactionInBFCacheEnabled() {
+@@ -2519,6 +2519,7 @@ bool IsAllowPageWithIDBConnectionAndTransactionInBFCacheEnabled() {
  }
 
  bool IsAllowURNsInIframeEnabled() {

diff --git a/build/patches/Private-network-access-content-settings.patch b/build/patches/Private-network-access-content-settings.patch
@@ -6,7 +6,6 @@ Block access to the local network by default in android while allowing
 user choice in desktop platforms.
 
 License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
-
 ---
  .../browser/chrome_content_browser_client.cc  |  3 +-
  ...eInsecurePrivateNetworkContentSetting.java | 93 +++++++++++++++++++
@@ -22,7 +21,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
 --- a/chrome/browser/chrome_content_browser_client.cc
 +++ b/chrome/browser/chrome_content_browser_client.cc
-@@ -7514,8 +7514,7 @@ ChromeContentBrowserClient::ShouldOverridePrivateNetworkRequestPolicy(
+@@ -7510,8 +7510,7 @@ ChromeContentBrowserClient::ShouldOverridePrivateNetworkRequestPolicy(
 
  #if BUILDFLAG(IS_ANDROID)
    if (base::FeatureList::IsEnabled(

diff --git a/build/patches/add-browser-policy.patch b/build/patches/add-browser-policy.patch
@@ -209,7 +209,7 @@ diff --git a/chrome/browser/policy/chrome_browser_policy_connector.cc b/chrome/b
 diff --git a/chrome/browser/policy/configuration_policy_handler_list_factory.cc b/chrome/browser/policy/configuration_policy_handler_list_factory.cc
 --- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc
 +++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc
-@@ -2190,9 +2190,9 @@ bool AreFuturePoliciesEnabledByDefault() {
+@@ -2184,9 +2184,9 @@ bool AreFuturePoliciesEnabledByDefault() {
    if (base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kTestType)) {
      return true;
    }