From 29739effb8d7e30b3862bdb37933ec0a72276992 Mon Sep 17 00:00:00 2001 From: Carmelo Messina Date: Thu, 19 Oct 2023 18:00:33 +0200 Subject: [PATCH] Disable some v118 flags --- build/patches/Disable-PrivacyGuide.patch | 18 ++++---- .../Disable-conversion-measurement-api.patch | 45 ++++++++++++++++++- ...-omission-of-URL-elements-in-Omnibox.patch | 17 ++++++- 3 files changed, 68 insertions(+), 12 deletions(-) diff --git a/build/patches/Disable-PrivacyGuide.patch b/build/patches/Disable-PrivacyGuide.patch index c614cb72..30debbad 100644 --- a/build/patches/Disable-PrivacyGuide.patch +++ b/build/patches/Disable-PrivacyGuide.patch @@ -23,17 +23,17 @@ diff --git a/chrome/browser/ui/webui/settings/settings_ui.cc b/chrome/browser/ui diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc --- a/chrome/common/chrome_features.cc +++ b/chrome/common/chrome_features.cc -@@ -518,8 +518,8 @@ BASE_FEATURE(kHaTSDesktopDevToolsIssuesCSP, +@@ -475,8 +475,8 @@ BASE_FEATURE(kPrivacyGuideAndroid3, - // Enables or disables the Happiness Tracking System for Desktop Privacy Guide. - BASE_FEATURE(kHappinessTrackingSurveysForDesktopPrivacyGuide, -- "HappinessTrackingSurveysForDesktopPrivacyGuide", + #if BUILDFLAG(IS_ANDROID) + BASE_FEATURE(kPrivacyGuidePreloadAndroid, +- "PrivacyGuidePreloadAndroid", - base::FEATURE_DISABLED_BY_DEFAULT); -+ "HappinessTrackingSurveysForDesktopPrivacyGuide", // must be disabled -+ base::FEATURE_DISABLED_BY_DEFAULT); // in Bromite - const base::FeatureParam - kHappinessTrackingSurveysForDesktopPrivacyGuideTime{ - &kHappinessTrackingSurveysForDesktopPrivacyGuide, "settings-time", ++ "PrivacyGuidePreloadAndroid", // disabled ++ base::FEATURE_DISABLED_BY_DEFAULT); // by default + #endif + + #if !BUILDFLAG(IS_ANDROID) @@ -1042,8 +1042,8 @@ BASE_FEATURE(kPrintPreviewSetupAssistance, #endif diff --git a/build/patches/Disable-conversion-measurement-api.patch b/build/patches/Disable-conversion-measurement-api.patch index 22c93ad2..45525f41 100644 --- a/build/patches/Disable-conversion-measurement-api.patch +++ b/build/patches/Disable-conversion-measurement-api.patch @@ -30,11 +30,11 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../attribution/request_headers_internal.cc | 1 + .../network/public/cpp/attribution_utils.cc | 2 + services/network/public/cpp/features.cc | 6 +- - third_party/blink/common/features.cc | 26 +- + third_party/blink/common/features.cc | 42 ++-- .../platform/runtime_enabled_features.json5 | 7 + ui/base/ui_base_features.cc | 2 +- ui/events/android/motion_event_android.cc | 6 +- - 23 files changed, 89 insertions(+), 261 deletions(-) + 23 files changed, 97 insertions(+), 269 deletions(-) diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml --- a/chrome/android/java/AndroidManifest.xml @@ -633,6 +633,25 @@ diff --git a/services/network/public/cpp/features.cc b/services/network/public/c 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 +@@ -36,14 +36,14 @@ BASE_FEATURE(kAcceleratedStaticBitmapImageSerialization, + + // Enable the Protected Audience's reporting with ad macro API. + BASE_FEATURE(kAdAuctionReportingWithMacroApi, +- "AdAuctionReportingWithMacroApi", +- base::FEATURE_ENABLED_BY_DEFAULT); ++ "AdAuctionReportingWithMacroApi", // disabled ++ base::FEATURE_DISABLED_BY_DEFAULT); // by default + + // Controls the capturing of the Ad-Auction-Signals header, and the maximum + // allowed Ad-Auction-Signals header value. + BASE_FEATURE(kAdAuctionSignals, +- "AdAuctionSignals", +- base::FEATURE_ENABLED_BY_DEFAULT); ++ "AdAuctionSignals", // disabled ++ base::FEATURE_DISABLED_BY_DEFAULT); // by default + const base::FeatureParam kAdAuctionSignalsMaxSizeBytes{ + &kAdAuctionSignals, "ad-auction-signals-max-size-bytes", 10000}; + @@ -302,8 +302,8 @@ const base::FeatureParam kBoostImagePriorityTightMediumLimit{ // https://github.com/patcg-individual-drafts/topics // Kill switch for the Topics API. @@ -674,6 +693,28 @@ diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/fea BASE_FEATURE(kCorrectFloatExtensionTestForWebGL, "CorrectFloatExtensionTestForWebGL", +@@ -807,8 +807,8 @@ BASE_FEATURE(kFledge, "Fledge", base::FEATURE_DISABLED_BY_DEFAULT); + // See + // https://github.com/WICG/turtledove/blob/main/FLEDGE_browser_bidding_and_auction_API.md + BASE_FEATURE(kFledgeBiddingAndAuctionServer, +- "FledgeBiddingAndAuctionServer", +- base::FEATURE_DISABLED_BY_DEFAULT); ++ "FledgeBiddingAndAuctionServer", // disabled ++ base::FEATURE_DISABLED_BY_DEFAULT); // by default + const base::FeatureParam kFledgeBiddingAndAuctionKeyURL{ + &kFledgeBiddingAndAuctionServer, "FledgeBiddingAndAuctionKeyURL", ""}; + +@@ -973,8 +973,8 @@ const char kIntensiveWakeUpThrottling_GracePeriodSeconds_Name[] = + // Kill switch for the Interest Group API, i.e. if disabled, the + // API exposure will be disabled regardless of the OT config. + BASE_FEATURE(kInterestGroupStorage, +- "InterestGroupStorage", +- base::FEATURE_DISABLED_BY_DEFAULT); ++ "InterestGroupStorage", // disabled ++ base::FEATURE_DISABLED_BY_DEFAULT); // by default + // TODO(crbug.com/1197209): Adjust these limits in response to usage. + const base::FeatureParam kInterestGroupStorageMaxOwners{ + &kInterestGroupStorage, "max_owners", 1000}; @@ -1367,16 +1367,16 @@ const base::FeatureParam kPrewarmFantasy = {&kPrewarmDefaultFontFamilies, "prewarm_fantasy", false}; #endif diff --git a/build/patches/Disable-omission-of-URL-elements-in-Omnibox.patch b/build/patches/Disable-omission-of-URL-elements-in-Omnibox.patch index 9c6b78d1..30e8ee31 100644 --- a/build/patches/Disable-omission-of-URL-elements-in-Omnibox.patch +++ b/build/patches/Disable-omission-of-URL-elements-in-Omnibox.patch @@ -7,10 +7,25 @@ a corresponding user option to individually disable their usage. License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- + .../browser/flags/android/chrome_feature_list.cc | 4 ++-- .../toolbar/chrome_location_bar_model_delegate.cc | 2 +- components/url_formatter/url_formatter.cc | 14 +++++++------- - 2 files changed, 8 insertions(+), 8 deletions(-) + 3 files changed, 10 insertions(+), 10 deletions(-) +diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc +--- a/chrome/browser/flags/android/chrome_feature_list.cc ++++ b/chrome/browser/flags/android/chrome_feature_list.cc +@@ -492,8 +492,8 @@ BASE_FEATURE(kAndroidNoVisibleHintForTablets, + base::FEATURE_DISABLED_BY_DEFAULT); + + BASE_FEATURE(kAndroidVisibleUrlTruncation, +- "AndroidVisibleUrlTruncation", +- base::FEATURE_DISABLED_BY_DEFAULT); ++ "AndroidVisibleUrlTruncation", // must be ++ base::FEATURE_DISABLED_BY_DEFAULT); // disabled + + BASE_FEATURE(kAnimatedImageDragShadow, + "AnimatedImageDragShadow", diff --git a/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.cc b/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.cc --- a/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.cc +++ b/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.cc