From 2fbd732a460369d530547d5e9f3d88ac9b9ea7e1 Mon Sep 17 00:00:00 2001 From: uazo Date: Wed, 25 Oct 2023 07:47:35 +0000 Subject: [PATCH] AUTOMATED - git apply results --- build/patches/00Add-a-flag-to-disable-GamePad-API.patch | 2 +- build/patches/00Add-support-to-jxl.patch | 4 ++-- .../00Disable-privacy-issues-in-password-manager.patch | 4 ++-- .../00Partitioning-all-cookies-by-top-frame-domain.patch | 2 +- build/patches/AImageReader-CFI-crash-mitigations.patch | 2 +- build/patches/Disable-text-fragments-by-default.patch | 2 +- .../Keep-flag-to-allow-screenshots-in-Incognito-mode.patch | 2 +- build/patches/Restore-Search-Ready-Omnibox-flag.patch | 2 +- build/patches/Restore-offline-indicator-v2-flag.patch | 2 +- .../Revert-flags-remove-disable-pull-to-refresh-effect.patch | 2 +- build/patches/Revert-flags-remove-num-raster-threads.patch | 2 +- 11 files changed, 13 insertions(+), 13 deletions(-) diff --git a/build/patches/00Add-a-flag-to-disable-GamePad-API.patch b/build/patches/00Add-a-flag-to-disable-GamePad-API.patch index 7d866519..6c1bf029 100644 --- a/build/patches/00Add-a-flag-to-disable-GamePad-API.patch +++ b/build/patches/00Add-a-flag-to-disable-GamePad-API.patch @@ -14,7 +14,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json --- a/chrome/browser/flag-metadata.json +++ b/chrome/browser/flag-metadata.json -@@ -7195,9 +7195,9 @@ +@@ -7205,9 +7205,9 @@ "expiry_milestone": 121 }, { diff --git a/build/patches/00Add-support-to-jxl.patch b/build/patches/00Add-support-to-jxl.patch index c8c4c4df..ab7c87ce 100644 --- a/build/patches/00Add-support-to-jxl.patch +++ b/build/patches/00Add-support-to-jxl.patch @@ -236,7 +236,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json --- a/chrome/browser/flag-metadata.json +++ b/chrome/browser/flag-metadata.json -@@ -3038,6 +3038,11 @@ +@@ -3043,6 +3043,11 @@ // This flag is used by web developers to test upcoming javascript features. "expiry_milestone": -1 }, @@ -2848,7 +2848,7 @@ diff --git a/tools/metrics/histograms/enums.xml b/tools/metrics/histograms/enums -@@ -64976,6 +64976,7 @@ from previous Chrome versions. +@@ -64986,6 +64986,7 @@ from previous Chrome versions. diff --git a/build/patches/00Disable-privacy-issues-in-password-manager.patch b/build/patches/00Disable-privacy-issues-in-password-manager.patch index 4f6bb38d..7ce264e6 100644 --- a/build/patches/00Disable-privacy-issues-in-password-manager.patch +++ b/build/patches/00Disable-privacy-issues-in-password-manager.patch @@ -114,7 +114,7 @@ diff --git a/components/password_manager/core/browser/affiliation/facet_manager. 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 -@@ -58,8 +58,8 @@ BASE_FEATURE(kFillingAcrossGroupedSites, +@@ -68,8 +68,8 @@ BASE_FEATURE(kFillingAcrossGroupedSites, // Enables the experiment for the password manager to only fill on account // selection, rather than autofilling on page load, with highlighting of fields. BASE_FEATURE(kFillOnAccountSelect, @@ -125,7 +125,7 @@ diff --git a/components/password_manager/core/browser/features/password_features #if BUILDFLAG(IS_IOS) // Enables migration to OSCrypt with a single query to the keychain. -@@ -77,14 +77,14 @@ BASE_FEATURE(kSharedPasswordNotificationUI, +@@ -87,14 +87,14 @@ BASE_FEATURE(kSharedPasswordNotificationUI, // Enables password receiving service including incoming password sharing // invitation sync data type. BASE_FEATURE(kPasswordManagerEnableReceiverService, diff --git a/build/patches/00Partitioning-all-cookies-by-top-frame-domain.patch b/build/patches/00Partitioning-all-cookies-by-top-frame-domain.patch index 4de6d0ff..79465c9f 100644 --- a/build/patches/00Partitioning-all-cookies-by-top-frame-domain.patch +++ b/build/patches/00Partitioning-all-cookies-by-top-frame-domain.patch @@ -83,7 +83,7 @@ diff --git a/net/base/features.cc b/net/base/features.cc // Enables partitioning of third party storage (IndexedDB, CacheStorage, etc.) // by the top level site to reduce fingerprinting. -@@ -490,8 +490,8 @@ BASE_FEATURE(kDigestAuthEnableSecureAlgorithms, +@@ -491,8 +491,8 @@ BASE_FEATURE(kDigestAuthEnableSecureAlgorithms, // third-party cookies are disabled due to a specific rule. // TODO(crbug.com/1468277): Default enable when UI work is complete. BASE_FEATURE(kThirdPartyPartitionedStorageAllowedByDefault, diff --git a/build/patches/AImageReader-CFI-crash-mitigations.patch b/build/patches/AImageReader-CFI-crash-mitigations.patch index f7e04a12..647dff86 100644 --- a/build/patches/AImageReader-CFI-crash-mitigations.patch +++ b/build/patches/AImageReader-CFI-crash-mitigations.patch @@ -84,7 +84,7 @@ diff --git a/base/android/android_image_reader_compat.h b/base/android/android_i diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json --- a/chrome/browser/flag-metadata.json +++ b/chrome/browser/flag-metadata.json -@@ -2961,9 +2961,9 @@ +@@ -2966,9 +2966,9 @@ "expiry_milestone": 125 }, { diff --git a/build/patches/Disable-text-fragments-by-default.patch b/build/patches/Disable-text-fragments-by-default.patch index 6187d4f5..ac11224d 100644 --- a/build/patches/Disable-text-fragments-by-default.patch +++ b/build/patches/Disable-text-fragments-by-default.patch @@ -37,7 +37,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json --- a/chrome/browser/flag-metadata.json +++ b/chrome/browser/flag-metadata.json -@@ -3186,6 +3186,11 @@ +@@ -3191,6 +3191,11 @@ "owners": [ "robsc", "napper", "alanlxl" ], "expiry_milestone": 130 }, diff --git a/build/patches/Keep-flag-to-allow-screenshots-in-Incognito-mode.patch b/build/patches/Keep-flag-to-allow-screenshots-in-Incognito-mode.patch index 23260932..dcfdface 100644 --- a/build/patches/Keep-flag-to-allow-screenshots-in-Incognito-mode.patch +++ b/build/patches/Keep-flag-to-allow-screenshots-in-Incognito-mode.patch @@ -15,7 +15,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json --- a/chrome/browser/flag-metadata.json +++ b/chrome/browser/flag-metadata.json -@@ -4969,9 +4969,9 @@ +@@ -4979,9 +4979,9 @@ "expiry_milestone": 120 }, { diff --git a/build/patches/Restore-Search-Ready-Omnibox-flag.patch b/build/patches/Restore-Search-Ready-Omnibox-flag.patch index 408aa758..858a15fa 100644 --- a/build/patches/Restore-Search-Ready-Omnibox-flag.patch +++ b/build/patches/Restore-Search-Ready-Omnibox-flag.patch @@ -37,7 +37,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json --- a/chrome/browser/flag-metadata.json +++ b/chrome/browser/flag-metadata.json -@@ -3265,6 +3265,11 @@ +@@ -3270,6 +3270,11 @@ // Added feature, for testing. expiry deep in future. "expiry_milestone": 116 }, diff --git a/build/patches/Restore-offline-indicator-v2-flag.patch b/build/patches/Restore-offline-indicator-v2-flag.patch index 39630a3c..2fb8eee7 100644 --- a/build/patches/Restore-offline-indicator-v2-flag.patch +++ b/build/patches/Restore-offline-indicator-v2-flag.patch @@ -127,7 +127,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json --- a/chrome/browser/flag-metadata.json +++ b/chrome/browser/flag-metadata.json -@@ -5936,6 +5936,11 @@ +@@ -5946,6 +5946,11 @@ "owners": [ "//components/search/OWNERS" ], "expiry_milestone": 118 }, diff --git a/build/patches/Revert-flags-remove-disable-pull-to-refresh-effect.patch b/build/patches/Revert-flags-remove-disable-pull-to-refresh-effect.patch index cc5d0463..16ca62ed 100644 --- a/build/patches/Revert-flags-remove-disable-pull-to-refresh-effect.patch +++ b/build/patches/Revert-flags-remove-disable-pull-to-refresh-effect.patch @@ -30,7 +30,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json --- a/chrome/browser/flag-metadata.json +++ b/chrome/browser/flag-metadata.json -@@ -1765,6 +1765,10 @@ +@@ -1770,6 +1770,10 @@ "yangsharon@google.com", "alexmos@google.com", "creis@google.com" ], "expiry_milestone": 122 }, diff --git a/build/patches/Revert-flags-remove-num-raster-threads.patch b/build/patches/Revert-flags-remove-num-raster-threads.patch index e5338716..fde5b1e1 100644 --- a/build/patches/Revert-flags-remove-num-raster-threads.patch +++ b/build/patches/Revert-flags-remove-num-raster-threads.patch @@ -46,7 +46,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json --- a/chrome/browser/flag-metadata.json +++ b/chrome/browser/flag-metadata.json -@@ -5542,6 +5542,10 @@ +@@ -5552,6 +5552,10 @@ "owners": [ "lazzzis", "aishwaryarj" ], "expiry_milestone": 120 },