From f9503ed837964c7e10973e5ae636c9d67801c63e Mon Sep 17 00:00:00 2001
From: uazo <29201891+uazo@users.noreply.github.com>
Date: Wed, 31 Jul 2024 11:55:42 +0000
Subject: [PATCH] [AUTO] Patches auto-rebase
---
build/patches/Add-bookmark-import-export-actions.patch | 2 +-
build/patches/Add-cromite-flags-support.patch | 2 +-
build/patches/Add-lifetime-options-for-permissions.patch | 2 +-
build/patches/Add-support-to-jxl.patch | 2 +-
build/patches/Allow-building-without-enable_reporting.patch | 2 +-
build/patches/Ask-for-restart-on-connection-change.patch | 4 ++--
build/patches/Deprecate-Data-URL-in-SVGUseElement.patch | 2 +-
build/patches/Disable-FedCm.patch | 2 +-
build/patches/Disable-GetInstalledRelatedApps-API.patch | 2 +-
build/patches/Disable-all-predictors-code.patch | 2 +-
build/patches/Disable-conversion-measurement-api.patch | 2 +-
build/patches/Disable-idle-detection.patch | 2 +-
.../Disable-media-router-and-remoting-by-default.patch | 2 +-
build/patches/Disable-plugins-enumeration.patch | 2 +-
.../Disable-prefers-reduced-transparency-media-query.patch | 2 +-
build/patches/Disable-text-fragments-by-default.patch | 2 +-
.../patches/Enable-Document-Open-Inheritance-Removal.patch | 2 +-
build/patches/Enable-Global-Privacy-Control.patch | 2 +-
build/patches/Guard-for-user-agent-reduction.patch | 2 +-
build/patches/Keep-disabled-FetchLaterAPI.patch | 2 +-
.../Log-dangling-attributes-in-some-html-elements.patch | 4 ++--
build/patches/Multiple-fingerprinting-mitigations.patch | 2 +-
.../Partitioning-all-cookies-by-top-frame-domain.patch | 4 ++--
...t-remove-allowscript-content-setting-secondary-url.patch | 2 +-
build/patches/Site-setting-for-images.patch | 2 +-
build/patches/Viewport-Protection-flag.patch | 6 +++---
build/patches/WIN-enable-pdf-plugin.patch | 2 +-
27 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/build/patches/Add-bookmark-import-export-actions.patch b/build/patches/Add-bookmark-import-export-actions.patch
index 4467b17c..d7f1800a 100644
--- a/build/patches/Add-bookmark-import-export-actions.patch
+++ b/build/patches/Add-bookmark-import-export-actions.patch
@@ -729,7 +729,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
static final PropertyKey[] ALL_KEYS = {
BOOKMARK_OPENER,
-@@ -108,6 +112,8 @@ class BookmarkToolbarProperties {
+@@ -109,6 +113,8 @@ class BookmarkToolbarProperties {
SELECTION_MODE_SHOW_OPEN_IN_INCOGNITO,
SELECTION_MODE_SHOW_MOVE,
SELECTION_MODE_SHOW_MARK_READ,
diff --git a/build/patches/Add-cromite-flags-support.patch b/build/patches/Add-cromite-flags-support.patch
index 0fcd428a..fced281c 100644
--- a/build/patches/Add-cromite-flags-support.patch
+++ b/build/patches/Add-cromite-flags-support.patch
@@ -1367,7 +1367,7 @@ diff --git a/components/offline_pages/core/offline_page_feature.h b/components/o
diff --git a/components/password_manager/core/browser/features/password_features.cc b/components/password_manager/core/browser/features/password_features.cc
--- a/components/password_manager/core/browser/features/password_features.cc
+++ b/components/password_manager/core/browser/features/password_features.cc
-@@ -206,4 +206,5 @@ BASE_FEATURE(kUsernameFirstFlowWithIntermediateValuesVoting,
+@@ -207,4 +207,5 @@ BASE_FEATURE(kUsernameFirstFlowWithIntermediateValuesVoting,
"UsernameFirstFlowWithIntermediateValuesVoting",
base::FEATURE_ENABLED_BY_DEFAULT);
diff --git a/build/patches/Add-lifetime-options-for-permissions.patch b/build/patches/Add-lifetime-options-for-permissions.patch
index df6a08fd..3c5ab86b 100644
--- a/build/patches/Add-lifetime-options-for-permissions.patch
+++ b/build/patches/Add-lifetime-options-for-permissions.patch
@@ -410,7 +410,7 @@ diff --git a/components/content_settings/core/common/content_settings_enums.mojo
diff --git a/components/page_info/android/java/src/org/chromium/components/page_info/PageInfoController.java b/components/page_info/android/java/src/org/chromium/components/page_info/PageInfoController.java
--- a/components/page_info/android/java/src/org/chromium/components/page_info/PageInfoController.java
+++ b/components/page_info/android/java/src/org/chromium/components/page_info/PageInfoController.java
-@@ -422,9 +422,9 @@ public class PageInfoController
+@@ -421,9 +421,9 @@ public class PageInfoController
String name,
String nameMidSentence,
int type,
diff --git a/build/patches/Add-support-to-jxl.patch b/build/patches/Add-support-to-jxl.patch
index 34fdf04c..6b3d232f 100644
--- a/build/patches/Add-support-to-jxl.patch
+++ b/build/patches/Add-support-to-jxl.patch
@@ -2648,7 +2648,7 @@ new file mode 100644
diff --git a/tools/metrics/histograms/enums.xml b/tools/metrics/histograms/enums.xml
--- a/tools/metrics/histograms/enums.xml
+++ b/tools/metrics/histograms/enums.xml
-@@ -20875,6 +20875,7 @@ from previous Chrome versions.
+@@ -20877,6 +20877,7 @@ from previous Chrome versions.
diff --git a/build/patches/Allow-building-without-enable_reporting.patch b/build/patches/Allow-building-without-enable_reporting.patch
index a391283f..ee9b03bd 100644
--- a/build/patches/Allow-building-without-enable_reporting.patch
+++ b/build/patches/Allow-building-without-enable_reporting.patch
@@ -362,7 +362,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/
#include "services/network/public/cpp/features.h"
#include "services/network/public/mojom/content_security_policy.mojom-blink.h"
#include "services/network/public/mojom/source_location.mojom-blink.h"
-@@ -2735,9 +2736,11 @@ void LocalFrame::MainFrameFirstMeaningfulPaint() {
+@@ -2760,9 +2761,11 @@ void LocalFrame::MainFrameFirstMeaningfulPaint() {
v8_local_compile_hints_producer_->GenerateData(kIsFinalData);
}
diff --git a/build/patches/Ask-for-restart-on-connection-change.patch b/build/patches/Ask-for-restart-on-connection-change.patch
index 11d936eb..698f277c 100644
--- a/build/patches/Ask-for-restart-on-connection-change.patch
+++ b/build/patches/Ask-for-restart-on-connection-change.patch
@@ -697,7 +697,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink
diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
--- a/third_party/blink/renderer/core/frame/local_frame.cc
+++ b/third_party/blink/renderer/core/frame/local_frame.cc
-@@ -3172,6 +3172,7 @@ void LocalFrame::DidFreeze() {
+@@ -3197,6 +3197,7 @@ void LocalFrame::DidFreeze() {
LoaderFreezeMode freeze_mode = GetLoaderFreezeMode();
GetDocument()->Fetcher()->SetDefersLoading(freeze_mode);
Loader().SetDefersLoading(freeze_mode);
@@ -705,7 +705,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/
}
void LocalFrame::DidResume() {
-@@ -3186,6 +3187,7 @@ void LocalFrame::DidResume() {
+@@ -3211,6 +3212,7 @@ void LocalFrame::DidResume() {
GetDocument()->Fetcher()->SetDefersLoading(LoaderFreezeMode::kNone);
Loader().SetDefersLoading(LoaderFreezeMode::kNone);
diff --git a/build/patches/Deprecate-Data-URL-in-SVGUseElement.patch b/build/patches/Deprecate-Data-URL-in-SVGUseElement.patch
index fb8ce3cf..e73a9631 100644
--- a/build/patches/Deprecate-Data-URL-in-SVGUseElement.patch
+++ b/build/patches/Deprecate-Data-URL-in-SVGUseElement.patch
@@ -10,7 +10,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -3299,8 +3299,8 @@
+@@ -3305,8 +3305,8 @@
status: "stable",
},
{
diff --git a/build/patches/Disable-FedCm.patch b/build/patches/Disable-FedCm.patch
index 22940878..6c41bd80 100644
--- a/build/patches/Disable-FedCm.patch
+++ b/build/patches/Disable-FedCm.patch
@@ -26,7 +26,7 @@ new file mode 100644
diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -1526,7 +1526,7 @@
+@@ -1532,7 +1532,7 @@
{
name: "FedCm",
public: true,
diff --git a/build/patches/Disable-GetInstalledRelatedApps-API.patch b/build/patches/Disable-GetInstalledRelatedApps-API.patch
index 80c7b0a1..95d69145 100644
--- a/build/patches/Disable-GetInstalledRelatedApps-API.patch
+++ b/build/patches/Disable-GetInstalledRelatedApps-API.patch
@@ -58,7 +58,7 @@ new file mode 100644
diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -2194,9 +2194,9 @@
+@@ -2200,9 +2200,9 @@
status: {"Android": "test", "default": "stable"},
},
{
diff --git a/build/patches/Disable-all-predictors-code.patch b/build/patches/Disable-all-predictors-code.patch
index 009f98a6..443d280b 100644
--- a/build/patches/Disable-all-predictors-code.patch
+++ b/build/patches/Disable-all-predictors-code.patch
@@ -537,7 +537,7 @@ diff --git a/third_party/blink/renderer/core/speculation_rules/document_speculat
diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -3109,7 +3109,7 @@
+@@ -3115,7 +3115,7 @@
//
// It also has some feature params defined throughout the codebase.
name: "Prerender2",
diff --git a/build/patches/Disable-conversion-measurement-api.patch b/build/patches/Disable-conversion-measurement-api.patch
index de3225bc..adafaf8f 100644
--- a/build/patches/Disable-conversion-measurement-api.patch
+++ b/build/patches/Disable-conversion-measurement-api.patch
@@ -898,7 +898,7 @@ diff --git a/third_party/blink/renderer/core/page/page.cc b/third_party/blink/re
diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -4016,6 +4016,7 @@
+@@ -4022,6 +4022,7 @@
},
{
name: "TopicsAPI",
diff --git a/build/patches/Disable-idle-detection.patch b/build/patches/Disable-idle-detection.patch
index d6b9288d..db409f60 100644
--- a/build/patches/Disable-idle-detection.patch
+++ b/build/patches/Disable-idle-detection.patch
@@ -55,7 +55,7 @@ diff --git a/third_party/blink/renderer/modules/idle/idle_detector.idl b/third_p
diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -2088,6 +2088,11 @@
+@@ -2094,6 +2094,11 @@
name: "IgnoresCSSTextTransformsForPlainTextCopy",
status: "stable",
},
diff --git a/build/patches/Disable-media-router-and-remoting-by-default.patch b/build/patches/Disable-media-router-and-remoting-by-default.patch
index 97b70d47..437525ec 100644
--- a/build/patches/Disable-media-router-and-remoting-by-default.patch
+++ b/build/patches/Disable-media-router-and-remoting-by-default.patch
@@ -79,7 +79,7 @@ diff --git a/third_party/blink/renderer/modules/remoteplayback/remote_playback.c
diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -3274,14 +3274,10 @@
+@@ -3280,14 +3280,10 @@
base_feature: "none",
},
{
diff --git a/build/patches/Disable-plugins-enumeration.patch b/build/patches/Disable-plugins-enumeration.patch
index 4aaee3fb..2f11d87c 100644
--- a/build/patches/Disable-plugins-enumeration.patch
+++ b/build/patches/Disable-plugins-enumeration.patch
@@ -10,7 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
--- a/third_party/blink/renderer/core/frame/local_frame.cc
+++ b/third_party/blink/renderer/core/frame/local_frame.cc
-@@ -2252,9 +2252,7 @@ WebContentSettingsClient* LocalFrame::GetContentSettingsClient() {
+@@ -2256,9 +2256,7 @@ WebContentSettingsClient* LocalFrame::GetContentSettingsClient() {
}
PluginData* LocalFrame::GetPluginData() const {
diff --git a/build/patches/Disable-prefers-reduced-transparency-media-query.patch b/build/patches/Disable-prefers-reduced-transparency-media-query.patch
index d495fbff..74789452 100644
--- a/build/patches/Disable-prefers-reduced-transparency-media-query.patch
+++ b/build/patches/Disable-prefers-reduced-transparency-media-query.patch
@@ -51,7 +51,7 @@ diff --git a/third_party/blink/renderer/core/preferences/preference_manager.idl
diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -3091,6 +3091,10 @@
+@@ -3097,6 +3097,10 @@
name: "PrefersReducedData",
status: "experimental",
},
diff --git a/build/patches/Disable-text-fragments-by-default.patch b/build/patches/Disable-text-fragments-by-default.patch
index c3f9c354..66c5eaf4 100644
--- a/build/patches/Disable-text-fragments-by-default.patch
+++ b/build/patches/Disable-text-fragments-by-default.patch
@@ -92,7 +92,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink
diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -3966,10 +3966,9 @@
+@@ -3972,10 +3972,9 @@
},
{
name: "TextFragmentIdentifiers",
diff --git a/build/patches/Enable-Document-Open-Inheritance-Removal.patch b/build/patches/Enable-Document-Open-Inheritance-Removal.patch
index e0155f88..e65e89c1 100644
--- a/build/patches/Enable-Document-Open-Inheritance-Removal.patch
+++ b/build/patches/Enable-Document-Open-Inheritance-Removal.patch
@@ -85,7 +85,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink
diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -1353,7 +1353,6 @@
+@@ -1359,7 +1359,6 @@
{
name: "DocumentOpenSandboxInheritanceRemoval",
status: "stable",
diff --git a/build/patches/Enable-Global-Privacy-Control.patch b/build/patches/Enable-Global-Privacy-Control.patch
index 318428f2..a89f63b5 100644
--- a/build/patches/Enable-Global-Privacy-Control.patch
+++ b/build/patches/Enable-Global-Privacy-Control.patch
@@ -811,7 +811,7 @@ diff --git a/third_party/blink/renderer/platform/loader/fetch/url_loader/dedicat
diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -1880,6 +1880,11 @@
+@@ -1886,6 +1886,11 @@
status: "stable",
base_feature: "none",
},
diff --git a/build/patches/Guard-for-user-agent-reduction.patch b/build/patches/Guard-for-user-agent-reduction.patch
index 13ae7a5f..c4ec96c0 100644
--- a/build/patches/Guard-for-user-agent-reduction.patch
+++ b/build/patches/Guard-for-user-agent-reduction.patch
@@ -54,7 +54,7 @@ diff --git a/content/common/user_agent.cc b/content/common/user_agent.cc
diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -3245,23 +3245,23 @@
+@@ -3251,23 +3251,23 @@
// If enabled, the deviceModel will be reduced to "K" and the
// androidVersion will be reduced to a static "10" string in android
// User-Agent string.
diff --git a/build/patches/Keep-disabled-FetchLaterAPI.patch b/build/patches/Keep-disabled-FetchLaterAPI.patch
index 45bb86d5..41d16d53 100644
--- a/build/patches/Keep-disabled-FetchLaterAPI.patch
+++ b/build/patches/Keep-disabled-FetchLaterAPI.patch
@@ -169,7 +169,7 @@ diff --git a/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.c
diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -1658,10 +1658,9 @@
+@@ -1664,10 +1664,9 @@
},
{
// The Blink runtime-enabled feature name for the API's IDL.
diff --git a/build/patches/Log-dangling-attributes-in-some-html-elements.patch b/build/patches/Log-dangling-attributes-in-some-html-elements.patch
index 7f953417..2d6f7086 100644
--- a/build/patches/Log-dangling-attributes-in-some-html-elements.patch
+++ b/build/patches/Log-dangling-attributes-in-some-html-elements.patch
@@ -331,7 +331,7 @@ diff --git a/third_party/blink/renderer/core/page/frame_tree.cc b/third_party/bl
diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -1457,8 +1457,8 @@
+@@ -1463,8 +1463,8 @@
// Experiment with preventing some instances of mutation XSS
// by escaping "<" and ">" in attribute values.
// See: crbug.com/1175016
@@ -342,7 +342,7 @@ diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5
},
{
name: "EventTimingInteractionCount",
-@@ -2364,6 +2364,12 @@
+@@ -2370,6 +2370,12 @@
name: "MacFontsDeprecateFontTraitsWorkaround",
status: "stable",
},
diff --git a/build/patches/Multiple-fingerprinting-mitigations.patch b/build/patches/Multiple-fingerprinting-mitigations.patch
index 526369f6..868f1a15 100644
--- a/build/patches/Multiple-fingerprinting-mitigations.patch
+++ b/build/patches/Multiple-fingerprinting-mitigations.patch
@@ -778,7 +778,7 @@ diff --git a/third_party/blink/renderer/platform/graphics/static_bitmap_image.h
diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -2693,6 +2693,15 @@
+@@ -2699,6 +2699,15 @@
status: {"Mac": "test", "default": "stable"},
base_feature: "none",
},
diff --git a/build/patches/Partitioning-all-cookies-by-top-frame-domain.patch b/build/patches/Partitioning-all-cookies-by-top-frame-domain.patch
index 54a566e8..875be8f9 100644
--- a/build/patches/Partitioning-all-cookies-by-top-frame-domain.patch
+++ b/build/patches/Partitioning-all-cookies-by-top-frame-domain.patch
@@ -175,7 +175,7 @@ diff --git a/components/content_settings/core/common/cookie_settings_base.cc b/c
constexpr StorageAccessResult GetStorageAccessResult(
ThirdPartyCookieAllowMechanism mechanism) {
using AllowMechanism = ThirdPartyCookieAllowMechanism;
-@@ -542,70 +532,16 @@ CookieSettingsBase::DecideAccess(
+@@ -546,70 +536,16 @@ CookieSettingsBase::DecideAccess(
return AllowAllCookies{ThirdPartyCookieAllowMechanism::kNone};
}
@@ -246,7 +246,7 @@ diff --git a/components/content_settings/core/common/cookie_settings_base.cc b/c
return AllowPartitionedCookies{};
}
-@@ -637,7 +573,7 @@ CookieSettingsBase::GetCookieSettingInternal(
+@@ -641,7 +577,7 @@ CookieSettingsBase::GetCookieSettingInternal(
}
return CookieSettingWithMetadata{/*cookie_setting=*/CONTENT_SETTING_ALLOW,
/*allow_partitioned_cookies=*/true,
diff --git a/build/patches/Revert-remove-allowscript-content-setting-secondary-url.patch b/build/patches/Revert-remove-allowscript-content-setting-secondary-url.patch
index d729debe..d064ff11 100644
--- a/build/patches/Revert-remove-allowscript-content-setting-secondary-url.patch
+++ b/build/patches/Revert-remove-allowscript-content-setting-secondary-url.patch
@@ -187,7 +187,7 @@ diff --git a/third_party/blink/public/platform/web_content_settings_client.h b/t
diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
--- a/third_party/blink/renderer/core/frame/local_frame.cc
+++ b/third_party/blink/renderer/core/frame/local_frame.cc
-@@ -4017,14 +4017,6 @@ const mojom::RendererContentSettingsPtr& LocalFrame::GetContentSettings() {
+@@ -4042,14 +4042,6 @@ const mojom::RendererContentSettingsPtr& LocalFrame::GetContentSettings() {
}
diff --git a/build/patches/Site-setting-for-images.patch b/build/patches/Site-setting-for-images.patch
index b7c614f4..9e4ecdd4 100644
--- a/build/patches/Site-setting-for-images.patch
+++ b/build/patches/Site-setting-for-images.patch
@@ -323,7 +323,7 @@ diff --git a/third_party/blink/public/platform/web_content_settings_client.h b/t
diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
--- a/third_party/blink/renderer/core/frame/local_frame.cc
+++ b/third_party/blink/renderer/core/frame/local_frame.cc
-@@ -4003,13 +4003,6 @@ const mojom::RendererContentSettingsPtr& LocalFrame::GetContentSettings() {
+@@ -4028,13 +4028,6 @@ const mojom::RendererContentSettingsPtr& LocalFrame::GetContentSettings() {
return loader_.GetDocumentLoader()->GetContentSettings();
}
diff --git a/build/patches/Viewport-Protection-flag.patch b/build/patches/Viewport-Protection-flag.patch
index 8994aac0..f9563898 100644
--- a/build/patches/Viewport-Protection-flag.patch
+++ b/build/patches/Viewport-Protection-flag.patch
@@ -492,7 +492,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_dom_window.cc b/third_p
diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
--- a/third_party/blink/renderer/core/frame/local_frame.cc
+++ b/third_party/blink/renderer/core/frame/local_frame.cc
-@@ -1560,6 +1560,10 @@ void LocalFrame::RestoreScrollOffsets() {
+@@ -1564,6 +1564,10 @@ void LocalFrame::RestoreScrollOffsets() {
saved_scroll_offsets_ = nullptr;
}
@@ -503,7 +503,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/
void LocalFrame::SetPageZoomFactor(float factor) {
SetPageAndTextZoomFactors(factor, text_zoom_factor_);
}
-@@ -1734,12 +1738,16 @@ mojom::blink::DevicePostureType LocalFrame::GetDevicePosture() {
+@@ -1738,12 +1742,16 @@ mojom::blink::DevicePostureType LocalFrame::GetDevicePosture() {
return mojo_handler_->GetDevicePosture();
}
@@ -522,7 +522,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/
return ratio;
}
-@@ -3309,6 +3317,11 @@ void LocalFrame::SetScaleFactor(float scale_factor) {
+@@ -3334,6 +3342,11 @@ void LocalFrame::SetScaleFactor(float scale_factor) {
DCHECK(!GetDocument() || !GetDocument()->Printing());
DCHECK(IsMainFrame());
diff --git a/build/patches/WIN-enable-pdf-plugin.patch b/build/patches/WIN-enable-pdf-plugin.patch
index 4580adb6..ccc55bce 100644
--- a/build/patches/WIN-enable-pdf-plugin.patch
+++ b/build/patches/WIN-enable-pdf-plugin.patch
@@ -10,7 +10,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
--- a/third_party/blink/renderer/core/frame/local_frame.cc
+++ b/third_party/blink/renderer/core/frame/local_frame.cc
-@@ -2253,7 +2253,9 @@ WebContentSettingsClient* LocalFrame::GetContentSettingsClient() {
+@@ -2257,7 +2257,9 @@ WebContentSettingsClient* LocalFrame::GetContentSettingsClient() {
}
PluginData* LocalFrame::GetPluginData() const {