From e7eecdca5e751718b7aa47a59aba71e66f884c44 Mon Sep 17 00:00:00 2001 From: Carmelo Messina Date: Thu, 27 Apr 2023 15:16:45 +0200 Subject: [PATCH] patches for 113 --- build/bromite_patches_list.txt | 3 - .../00Add-a-flag-to-disable-GamePad-API.patch | 4 +- .../00Add-setting-to-clear-data-on-exit.patch | 46 +++--- ...d-setting-to-invert-tap-and-long-tap.patch | 58 +++---- ...ORS-Preflight-Cache-on-clearing-data.patch | 4 +- .../patches/00Disable-BackForwardCache.patch | 6 +- build/patches/00Disable-FedCm.patch | 4 +- .../00Disable-SHA1-Server-Signature.patch | 2 +- ...devtools-remote-and-custom-protocols.patch | 4 +- ...e-privacy-issues-in-password-manager.patch | 10 +- ...isable-speechSynthesis-getVoices-API.patch | 8 +- ...le-Document-Open-Inheritance-Removal.patch | 4 +- ...ct-the-entire-FrameTree-like-desktop.patch | 2 +- .../00Fonts-fingerprinting-mitigation.patch | 80 +++++----- build/patches/00Internal-firewall.patch | 10 +- .../patches/00Keyboard-protection-flag.patch | 8 +- .../00Partition-HSTS-cache-by-NAK.patch | 46 +++--- ...ning-all-cookies-by-top-frame-domain.patch | 18 +-- ...th-header-upon-cross-origin-redirect.patch | 2 +- ...0Remove-detection-of-captive-portals.patch | 2 +- ...xperimental-relative-c---abi-vtables.patch | 2 +- ...e-kAutomaticLazyFrameLoadingToEmbeds.patch | 2 +- .../00Viewport-Protection-Site-Setting.patch | 18 +-- .../patches/00Viewport-Protection-flag.patch | 46 +++--- ...O-AImageReader-CFI-crash-mitigations.patch | 2 +- ...ADDTO-Add-AllowUserCertificates-flag.patch | 2 +- ...ADDTO-Add-a-proxy-configuration-page.patch | 8 +- ...N-ADDTO-Add-an-always-incognito-mode.patch | 2 +- ...O-Add-bookmark-import-export-actions.patch | 2 +- ...d-flag-to-configure-maximum-connecti.patch | 2 +- ...DDTO-Add-flag-to-disable-IPv6-probes.patch | 8 +- ...d-flag-to-disable-external-intent-re.patch | 2 +- ...Add-lifetime-options-for-permissions.patch | 2 +- .../00WIN-ADDTO-Add-webGL-site-setting.patch | 8 +- ...00WIN-ADDTO-Add-webRTC-site-settings.patch | 6 +- ...DDTO-Content-settings-infrastructure.patch | 2 +- ...TO-Experimental-user-scripts-support.patch | 50 +++--- .../00WIN-ADDTO-JIT-site-settings.patch | 10 +- ...TO-Restore-Search-Ready-Omnibox-flag.patch | 2 +- ...Revert-flags--remove-num-raster-thre.patch | 4 +- ...Revert-the-removal-to-block-autoplay.patch | 10 +- .../00WIN-ADDTO-Timezone-customization.patch | 8 +- ...penH264--enable-ARM-ARM64-optimizati.patch | 2 +- ...ngoogled-chr--Disable-profile-avatar.patch | 2 +- .../00WIN-Disable-TabHoverCard-images.patch | 2 +- build/patches/00WIN-Disable-sharing-hub.patch | 4 +- ...able-Network-Service-Sandbox-and-CIG.patch | 2 +- build/patches/00WIN-Fix-log-to-file.patch | 2 +- build/patches/00WIN-Fix-windows-build.patch | 43 +++-- ...enable-HighEfficiencyMode-by-default.patch | 21 +-- build/patches/00WIN-enable-pdf-plugin.patch | 2 +- ...message-for-unsupported-hardware-aes.patch | 24 +-- .../AImageReader-CFI-crash-mitigations.patch | 14 +- .../Add-AllowUserCertificates-flag.patch | 26 ++-- .../Add-IsCleartextPermitted-flag.patch | 12 +- .../Add-a-proxy-configuration-page.patch | 38 +++-- ...dd-custom-tab-intents-privacy-option.patch | 45 +++--- build/patches/Add-exit-menu-item.patch | 10 +- ...g-for-omnibox-autocomplete-filtering.patch | 12 +- .../Add-flag-for-save-data-header.patch | 8 +- ...nfigure-maximum-connections-per-host.patch | 8 +- ...ontrol-video-playback-resume-feature.patch | 20 +-- .../Add-flag-to-disable-IPv6-probes.patch | 14 +- ...-to-disable-external-intent-requests.patch | 6 +- .../Add-flag-to-disable-vibration.patch | 12 +- ...-switch-for-unsupported-clangd-flags.patch | 2 +- ...Add-lifetime-options-for-permissions.patch | 114 +++++++------- .../Add-menu-item-to-bookmark-all-tabs.patch | 28 ++-- .../Add-menu-item-to-view-source.patch | 10 +- .../Add-option-to-force-tablet-UI.patch | 26 ++-- ...-to-not-persist-tabs-across-sessions.patch | 18 +-- .../Add-option-to-use-home-page-as-NTP.patch | 12 +- build/patches/Add-site-engagement-flag.patch | 12 +- ...-support-for-ISupportHelpAndFeedback.patch | 19 ++- build/patches/Add-webGL-site-setting.patch | 12 +- build/patches/Add-webRTC-site-settings.patch | 6 +- ...ow-building-without-enable_reporting.patch | 18 +-- ...ow-building-without-supervised-users.patch | 2 +- .../Allow-playing-audio-in-background.patch | 4 +- ...ioBuffer-AnalyserNode-fp-mitigations.patch | 16 +- ...Block-gateway-attacks-via-websockets.patch | 8 +- .../Block-qjz9zk-or-trk-requests.patch | 4 +- build/patches/Bromite-auto-updater.patch | 28 ++-- .../Bromite-subresource-adblocker.patch | 44 +++--- build/patches/Client-hints-overrides.patch | 8 +- .../Content-settings-infrastructure.patch | 18 +-- build/patches/Disable-AGSA-by-default.patch | 34 ++-- ...ble-Accessibility-service-by-default.patch | 4 +- .../patches/Disable-AsyncDNS-by-default.patch | 4 +- ...DRM-media-origin-IDs-preprovisioning.patch | 2 +- .../Disable-FLoC-and-privacy-sandbox.patch | 10 +- build/patches/Disable-PrivacyGuide.patch | 2 +- .../Disable-StartSurface-feature.patch | 2 +- build/patches/Disable-TLS-resumption.patch | 18 +-- .../patches/Disable-all-predictors-code.patch | 37 +++-- build/patches/Disable-all-promo-dialogs.patch | 4 +- .../Disable-conversion-measurement-api.patch | 33 ++-- build/patches/Disable-crash-reporting.patch | 2 +- ...Disable-fetching-of-all-field-trials.patch | 14 +- build/patches/Disable-idle-detection.patch | 2 +- ...-lock-icon-in-address-bar-by-default.patch | 2 +- ...media-router-and-remoting-by-default.patch | 8 +- .../Disable-minidump-upload-scheduling.patch | 2 +- .../patches/Disable-plugins-enumeration.patch | 2 +- .../Disable-smart-selection-by-default.patch | 16 +- ...isable-some-signed-exchange-features.patch | 2 +- .../Disable-text-fragments-by-default.patch | 18 +-- .../Disable-third-party-origin-trials.patch | 16 +- build/patches/Disable-various-metrics.patch | 12 +- .../Do-not-build-API-keys-infobar.patch | 2 +- .../Do-not-compile-QR-code-sharing.patch | 12 +- .../Do-not-hide-component-extensions.patch | 24 ++- .../patches/Do-not-link-with-libatomic.patch | 2 +- .../Do-not-store-passwords-by-default.patch | 4 +- build/patches/DoH-improvements.patch | 6 +- .../Enable-Certificate-Transparency.patch | 18 +-- build/patches/Enable-ECH-by-default.patch | 6 +- ...able-PermuteTLSExtensions-by-default.patch | 2 +- ...-SPPI-for-devices-with-enough-memory.patch | 2 +- ...ctOriginIsolation-and-SitePerProcess.patch | 8 +- ...e-darken-websites-checkbox-in-themes.patch | 4 +- .../Enable-network-isolation-features.patch | 23 ++- ...-prefetch-privacy-changes-by-default.patch | 2 +- build/patches/Enable-share-intent.patch | 34 ++-- ...ble-third-party-storage-partitioning.patch | 2 +- .../Experimental-user-scripts-support.patch | 78 +++++----- .../Guard-for-user-agent-reduction.patch | 6 +- ...story-number-of-days-privacy-setting.patch | 36 +++-- ...number-of-autocomplete-matches-to-10.patch | 6 +- ...ripts-for-AMP-tracking-ads-and-video.patch | 8 +- .../Invalidate-components-public-key.patch | 2 +- build/patches/JIT-site-settings.patch | 12 +- .../Keep-empty-tabs-between-sessions.patch | 2 +- ...-allow-screenshots-in-Incognito-mode.patch | 4 +- .../patches/Modify-default-preferences.patch | 32 ++-- ...nt-settings-back-to-privacy-settings.patch | 14 +- .../Multiple-fingerprinting-mitigations.patch | 34 ++-- build/patches/Never-fetch-popular-sites.patch | 6 +- ...uiltin-autocomplete-for-chrome-flags.patch | 2 +- build/patches/OpenSearch-miscellaneous.patch | 2 +- .../patches/Override-Navigator-Language.patch | 2 +- .../Partition-Blink-memory-cache.patch | 22 +-- .../patches/Re-introduce-kWebAuthCable.patch | 147 ------------------ ...-modal-dialog-flag-to-close-all-tabs.patch | 49 +++--- ...e-introduce-override_build_timestamp.patch | 2 +- ...ders-in-DoH-requests-to-bare-minimum.patch | 2 +- ...referrals-in-cross-origin-navigation.patch | 18 +-- ...cklisted-URLs-upon-bookmark-creation.patch | 2 +- build/patches/Remove-help-menu-item.patch | 4 +- ...ndow-name-on-cross-origin-navigation.patch | 4 +- .../Restore-Search-Ready-Omnibox-flag.patch | 30 ++-- .../Restore-Simplified-NTP-launch.patch | 26 ++-- ...-button-in-top-toolbar-customization.patch | 10 +- .../Restore-classic-new-tab-page.patch | 50 +++--- .../Restore-offline-indicator-v2-flag.patch | 24 +-- ...Delete-block-external-form-redirects.patch | 10 +- ...evert-Permit-blocking-of-view-source.patch | 6 +- ...emove-disable-pull-to-refresh-effect.patch | 14 +- ...vert-flags-remove-num-raster-threads.patch | 10 +- ...l-of-execution-context-address-space.patch | 66 +++----- ...moval-of-an-option-to-block-autoplay.patch | 18 +-- ...tings-for-cookies-javascript-and-ads.patch | 8 +- build/patches/Site-setting-for-images.patch | 10 +- build/patches/Timezone-customization.patch | 18 +-- build/patches/Unexpire-tab-groups-flags.patch | 59 ------- build/patches/Update-i18n-zh_CN-support.patch | 144 ----------------- build/patches/User-agent-customization.patch | 50 +++--- build/patches/autofill-miscellaneous.patch | 18 +-- ...build-remove-calling-untrusted-hooks.patch | 10 +- .../disable-WebView-variations-support.patch | 2 +- build/patches/kill-Vision.patch | 4 +- ...nH264-enable-ARM-ARM64-optimizations.patch | 2 +- .../sharing-hub-always-use-visible-URL.patch | 4 +- ...gled-chromium-Disable-profile-avatar.patch | 4 +- ...romium-Disable-translate-integration.patch | 4 +- ...ed-chromium-no-special-hosts-domains.patch | 92 +++++------ ...RTC-do-not-expose-local-IP-addresses.patch | 2 +- 177 files changed, 1233 insertions(+), 1612 deletions(-) delete mode 100644 build/patches/Re-introduce-kWebAuthCable.patch delete mode 100644 build/patches/Unexpire-tab-groups-flags.patch delete mode 100644 build/patches/Update-i18n-zh_CN-support.patch diff --git a/build/bromite_patches_list.txt b/build/bromite_patches_list.txt index 7c37fb9f..b7c3b58a 100644 --- a/build/bromite_patches_list.txt +++ b/build/bromite_patches_list.txt @@ -134,7 +134,6 @@ Add-Alt-D-hotkey-to-focus-address-bar.patch User-agent-customization.patch Add-AllowUserCertificates-flag.patch Add-IsCleartextPermitted-flag.patch -Unexpire-tab-groups-flags.patch Add-flag-for-omnibox-autocomplete-filtering.patch Revert-Delete-block-external-form-redirects.patch Add-flag-to-disable-external-intent-requests.patch @@ -163,7 +162,6 @@ Revert-Permit-blocking-of-view-source.patch Disable-safety-check.patch Disable-all-predictors-code.patch OpenSearch-miscellaneous.patch -Update-i18n-zh_CN-support.patch Add-flag-for-save-data-header.patch Disable-UA-full-version.patch Dictionary-suggestions-for-the-Omnibox.patch @@ -186,7 +184,6 @@ Partition-Blink-memory-cache.patch Remove-navigator.connection-info.patch Disable-PrivacyGuide.patch sharing-hub-always-use-visible-URL.patch -Re-introduce-kWebAuthCable.patch Enable-HEVC-by-default.patch Partition-blobs-by-top-frame-URL.patch Override-Navigator-Language.patch 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 8dca3069..f2b4a677 100644 --- a/build/patches/00Add-a-flag-to-disable-GamePad-API.patch +++ b/build/patches/00Add-a-flag-to-disable-GamePad-API.patch @@ -13,7 +13,7 @@ Adds restrict-gamepad-access flag (default active) to disable GamePad API. 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 -@@ -6235,9 +6235,9 @@ +@@ -6360,9 +6360,9 @@ "expiry_milestone": 120 }, { @@ -28,7 +28,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -2708,7 +2708,7 @@ const char kReduceUserAgentDescription[] = +@@ -2782,7 +2782,7 @@ const char kReduceAcceptLanguageDescription[] = const char kRestrictGamepadAccessName[] = "Restrict gamepad access"; const char kRestrictGamepadAccessDescription[] = diff --git a/build/patches/00Add-setting-to-clear-data-on-exit.patch b/build/patches/00Add-setting-to-clear-data-on-exit.patch index 473ddfcd..6cdf8619 100644 --- a/build/patches/00Add-setting-to-clear-data-on-exit.patch +++ b/build/patches/00Add-setting-to-clear-data-on-exit.patch @@ -31,7 +31,7 @@ Subject: Add setting to clear data on exit diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni --- a/chrome/android/chrome_java_sources.gni +++ b/chrome/android/chrome_java_sources.gni -@@ -278,6 +278,7 @@ chrome_java_sources = [ +@@ -283,6 +283,7 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragmentAdvanced.java", "java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragmentBasic.java", "java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataTabsFragment.java", @@ -42,15 +42,15 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java -@@ -136,6 +136,7 @@ import org.chromium.chrome.browser.profiles.OTRProfileID; - import org.chromium.chrome.browser.profiles.Profile; +@@ -135,6 +135,7 @@ import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.profiles.ProfileManager; import org.chromium.chrome.browser.quick_delete.QuickDeleteController; + import org.chromium.chrome.browser.quick_delete.QuickDeleteMetricsDelegate; +import org.chromium.chrome.browser.profiles.ProfileManagerUtils; import org.chromium.chrome.browser.read_later.ReadingListBackPressHandler; import org.chromium.chrome.browser.read_later.ReadingListUtils; import org.chromium.chrome.browser.reengagement.ReengagementNotificationController; -@@ -1304,7 +1305,11 @@ public class ChromeTabbedActivity extends ChromeActivity Clear browsing data @@ -226,7 +226,7 @@ diff --git a/chrome/app/settings_strings.grdp b/chrome/app/settings_strings.grdp diff --git a/chrome/browser/android/browsing_data/browsing_data_bridge.cc b/chrome/browser/android/browsing_data/browsing_data_bridge.cc --- a/chrome/browser/android/browsing_data/browsing_data_bridge.cc +++ b/chrome/browser/android/browsing_data/browsing_data_bridge.cc -@@ -327,7 +327,7 @@ static void JNI_BrowsingDataBridge_SetLastClearBrowsingDataTab( +@@ -326,7 +326,7 @@ static void JNI_BrowsingDataBridge_SetLastClearBrowsingDataTab( const JavaParamRef& obj, jint tab_index) { DCHECK_GE(tab_index, 0); @@ -270,7 +270,7 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager. diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc --- a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc +++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc -@@ -424,6 +424,9 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData( +@@ -421,6 +421,9 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData( delete_end_, CreateTaskCompletionClosure(TracingDataType::kHistory), &history_task_tracker_); } @@ -280,7 +280,7 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate. if (ClipboardRecentContent::GetInstance()) ClipboardRecentContent::GetInstance()->SuppressClipboardContent(); -@@ -474,7 +477,9 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData( +@@ -471,7 +474,9 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData( prerender::NoStatePrefetchManager::CLEAR_PRERENDER_CONTENTS | prerender::NoStatePrefetchManager::CLEAR_PRERENDER_HISTORY); } @@ -290,7 +290,7 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate. // The saved Autofill profiles and credit cards can include the origin from // which these profiles and credit cards were learned. These are a form of // history, so clear them as well. -@@ -495,7 +500,9 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData( +@@ -492,7 +497,9 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData( if (data_manager) data_manager->Refresh(); } @@ -300,7 +300,7 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate. base::ThreadPool::PostTaskAndReply( FROM_HERE, {base::TaskPriority::USER_VISIBLE, base::MayBlock()}, base::BindOnce( -@@ -587,9 +594,13 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData( +@@ -578,9 +585,13 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData( CreateTaskCompletionClosure(TracingDataType::kExploreSites)); } #endif @@ -374,7 +374,7 @@ diff --git a/chrome/browser/profiles/android/profile_manager_utils.cc b/chrome/b diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profiles/profile_manager.cc --- a/chrome/browser/profiles/profile_manager.cc +++ b/chrome/browser/profiles/profile_manager.cc -@@ -1405,6 +1405,19 @@ void ProfileManager::DoFinalInit(ProfileInfo* profile_info, +@@ -1421,6 +1421,19 @@ void ProfileManager::DoFinalInit(ProfileInfo* profile_info, } } @@ -474,7 +474,7 @@ diff --git a/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd -@@ -1492,6 +1492,9 @@ Your Google account may have other forms of browsing history like searches and a +@@ -1495,6 +1495,9 @@ Your Google account may have other forms of browsing history like searches and a Basic @@ -487,7 +487,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc --- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc +++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -@@ -1679,6 +1679,7 @@ void AddPrivacyStrings(content::WebUIDataSource* html_source, +@@ -1716,6 +1716,7 @@ void AddPrivacyStrings(content::WebUIDataSource* html_source, {"clearedData", IDS_SETTINGS_CLEARED_DATA}, {"clearBrowsingData", IDS_SETTINGS_CLEAR_BROWSING_DATA}, {"clearBrowsingDataDescription", IDS_SETTINGS_CLEAR_DATA_DESCRIPTION}, @@ -498,7 +498,7 @@ diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provide diff --git a/components/browsing_data/core/browsing_data_utils.cc b/components/browsing_data/core/browsing_data_utils.cc --- a/components/browsing_data/core/browsing_data_utils.cc +++ b/components/browsing_data/core/browsing_data_utils.cc -@@ -314,6 +314,40 @@ bool GetDeletionPreferenceFromDataType( +@@ -318,6 +318,40 @@ bool GetDeletionPreferenceFromDataType( BrowsingDataType data_type, ClearBrowsingDataTab clear_browsing_data_tab, std::string* out_pref) { diff --git a/build/patches/00Add-setting-to-invert-tap-and-long-tap.patch b/build/patches/00Add-setting-to-invert-tap-and-long-tap.patch index 4568eb79..1db8b876 100644 --- a/build/patches/00Add-setting-to-invert-tap-and-long-tap.patch +++ b/build/patches/00Add-setting-to-invert-tap-and-long-tap.patch @@ -71,7 +71,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/s diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuItem.java b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuItem.java --- a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuItem.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuItem.java -@@ -88,8 +88,9 @@ class ChromeContextMenuItem { +@@ -89,8 +89,9 @@ class ChromeContextMenuItem { int SHARE_HIGHLIGHT = 32; int REMOVE_HIGHLIGHT = 33; int LEARN_MORE = 34; @@ -82,7 +82,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr } /** -@@ -131,6 +132,7 @@ class ChromeContextMenuItem { +@@ -132,6 +133,7 @@ class ChromeContextMenuItem { R.id.contextmenu_share_highlight, // Item.SHARE_HIGHLIGHT R.id.contextmenu_remove_highlight, // Item.REMOVE_HIGHLIGHT R.id.contextmenu_learn_more, // Item.LEARN_MORE @@ -90,7 +90,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr }; /** -@@ -172,6 +174,7 @@ class ChromeContextMenuItem { +@@ -173,6 +175,7 @@ class ChromeContextMenuItem { R.string.contextmenu_share_highlight, // Item.SHARE_HIGHLIGHT R.string.contextmenu_remove_highlight, // Item.REMOVE_HIGHLIGHT R.string.contextmenu_learn_more, // Item.LEARN_MORE @@ -101,7 +101,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java --- a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java -@@ -362,6 +362,9 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { +@@ -243,6 +243,9 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { if (mParams.isAnchor()) { ModelList linkGroup = new ModelList(); @@ -111,9 +111,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr if (FirstRunStatus.getFirstRunFlowComplete() && !isEmptyUrl(mParams.getUrl()) && UrlUtilities.isAcceptedScheme(mParams.getUrl())) { if (mMode == ContextMenuMode.NORMAL) { -@@ -728,6 +731,8 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { - ShareHelper.shareImage(getWindow(), getProfile(), - ShareHelper.getLastShareComponentName(), uri, null); +@@ -601,6 +604,8 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { + ShareHelper.shareDirectly( + params, ShareHelper.getLastShareComponentName(), getProfile(), false); }); + } else if (itemId == R.id.contextmenu_open_in_tab) { + mItemDelegate.onOpenUrl(mParams.getUrl(), mParams.getReferrer()); @@ -141,7 +141,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextM diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -7100,6 +7100,11 @@ const FeatureEntry kFeatureEntries[] = { +@@ -7398,6 +7398,11 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kMoveTopToolbarToBottomDescription, kOsAndroid, FEATURE_VALUE_TYPE(features::kMoveTopToolbarToBottom)}, @@ -168,7 +168,7 @@ diff --git a/chrome/browser/contextmenu/java/src/org/chromium/chrome/browser/con diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -1830,6 +1830,10 @@ const char kMoveTopToolbarToBottomName[] = "Move top toolbar to bottom"; +@@ -1821,6 +1821,10 @@ const char kMoveTopToolbarToBottomName[] = "Move top toolbar to bottom"; const char kMoveTopToolbarToBottomDescription[] = "Move the top toolbar to the bottom."; @@ -182,7 +182,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -1025,6 +1025,9 @@ extern const char kCompositorThreadedScrollbarScrollingDescription[]; +@@ -1024,6 +1024,9 @@ extern const char kImprovedKeyboardShortcutsDescription[]; extern const char kMoveTopToolbarToBottomName[]; extern const char kMoveTopToolbarToBottomDescription[]; @@ -195,7 +195,7 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java -@@ -377,6 +377,8 @@ public abstract class ChromeFeatureList { +@@ -387,6 +387,8 @@ public abstract class ChromeFeatureList { public static final String MODAL_PERMISSION_DIALOG_VIEW = "ModalPermissionDialogView"; public static final String MOVE_TOP_TOOLBAR_TO_BOTTOM = "MoveTopToolbarToBottom"; @@ -204,19 +204,19 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f public static final String NOTIFICATION_PERMISSION_VARIANT = "NotificationPermissionVariant"; public static final String NOTIFICATION_PERMISSION_BOTTOM_SHEET = "NotificationPermissionBottomSheet"; -@@ -637,6 +639,8 @@ public abstract class ChromeFeatureList { +@@ -656,6 +658,8 @@ public abstract class ChromeFeatureList { new CachedFlag(LENS_CAMERA_ASSISTED_SEARCH, true); public static final CachedFlag sMoveTopToolbarToBottom = new CachedFlag(MOVE_TOP_TOOLBAR_TO_BOTTOM, false); + public static final CachedFlag sShowAlwaysContextMenuOnLinks = + new CachedFlag(SHOW_ALWAYS_CONTEXT_MENU_ON_LINKS, false); - public static final CachedFlag sOSKResizesVisualViewportByDefault = - new CachedFlag(OSK_RESIZES_VISUAL_VIEWPORT, false); public static final CachedFlag sOmahaMinSdkVersionAndroid = + new CachedFlag(OMAHA_MIN_SDK_VERSION_ANDROID, false); + public static final CachedFlag sOmniboxMatchToolbarAndStatusBarColor = diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd -@@ -1656,6 +1656,12 @@ Your Google account may have other forms of browsing history like searches and a +@@ -1659,6 +1659,12 @@ Your Google account may have other forms of browsing history like searches and a Move toolbar to bottom @@ -229,7 +229,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro -@@ -2687,6 +2693,9 @@ To change this setting, <resetlink>reset sync

<resetlink>reset sync

Open in new Chrome tab @@ -311,9 +311,9 @@ diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/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 -@@ -964,6 +964,10 @@ BASE_FEATURE(kEnablePenetratingImageSelection, - "EnablePenetratingImageSelection", - base::FEATURE_ENABLED_BY_DEFAULT); +@@ -964,6 +964,10 @@ BASE_FEATURE(kScopeMemoryCachePerContext, + "ScopeMemoryCachePerContext", + base::FEATURE_DISABLED_BY_DEFAULT); +BASE_FEATURE(kShowAlwaysContextMenuOnLinks, + "ShowAlwaysContextMenuOnLinks", @@ -325,7 +325,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 -@@ -403,6 +403,8 @@ BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kScopeMemoryCachePerContext); +@@ -420,6 +420,8 @@ BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kScopeMemoryCachePerContext); BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kEnablePenetratingImageSelection); @@ -337,7 +337,7 @@ diff --git a/third_party/blink/public/common/features.h b/third_party/blink/publ diff --git a/third_party/blink/renderer/core/html/html_anchor_element.cc b/third_party/blink/renderer/core/html/html_anchor_element.cc --- a/third_party/blink/renderer/core/html/html_anchor_element.cc +++ b/third_party/blink/renderer/core/html/html_anchor_element.cc -@@ -55,6 +55,7 @@ +@@ -53,6 +53,7 @@ #include "third_party/blink/renderer/core/loader/ping_loader.h" #include "third_party/blink/renderer/core/navigation_api/navigation_api.h" #include "third_party/blink/renderer/core/page/chrome_client.h" @@ -345,7 +345,7 @@ diff --git a/third_party/blink/renderer/core/html/html_anchor_element.cc b/third #include "third_party/blink/renderer/core/page/page.h" #include "third_party/blink/renderer/core/speculation_rules/document_speculation_rules.h" #include "third_party/blink/renderer/platform/heap/garbage_collected.h" -@@ -418,7 +419,7 @@ void HTMLAnchorElement::SendPings(const KURL& destination_url) const { +@@ -394,7 +395,7 @@ void HTMLAnchorElement::SendPings(const KURL& destination_url) const { } } @@ -354,7 +354,7 @@ diff --git a/third_party/blink/renderer/core/html/html_anchor_element.cc b/third event.SetDefaultHandled(); LocalDOMWindow* window = GetDocument().domWindow(); -@@ -572,6 +573,15 @@ void HTMLAnchorElement::HandleClick(Event& event) { +@@ -548,6 +549,15 @@ void HTMLAnchorElement::HandleClick(Event& event) { } } @@ -408,7 +408,7 @@ diff --git a/third_party/blink/renderer/core/html/html_image_element.cc b/third_ #include "third_party/blink/renderer/core/paint/timing/paint_timing.h" #include "third_party/blink/renderer/core/probe/core_probes.h" #include "third_party/blink/renderer/core/style/content_data.h" -@@ -712,6 +714,21 @@ void HTMLImageElement::DidFinishLifecycleUpdate( +@@ -718,6 +720,21 @@ void HTMLImageElement::DidFinishLifecycleUpdate( } } @@ -433,7 +433,7 @@ diff --git a/third_party/blink/renderer/core/html/html_image_element.cc b/third_ diff --git a/third_party/blink/renderer/core/html/html_image_element.h b/third_party/blink/renderer/core/html/html_image_element.h --- a/third_party/blink/renderer/core/html/html_image_element.h +++ b/third_party/blink/renderer/core/html/html_image_element.h -@@ -227,6 +227,8 @@ class CORE_EXPORT HTMLImageElement final +@@ -225,6 +225,8 @@ class CORE_EXPORT HTMLImageElement final void DidAddUserAgentShadowRoot(ShadowRoot&) override; void AdjustStyle(ComputedStyleBuilder&) override; @@ -445,7 +445,7 @@ diff --git a/third_party/blink/renderer/core/html/html_image_element.h b/third_p diff --git a/third_party/blink/renderer/core/page/context_menu_controller.cc b/third_party/blink/renderer/core/page/context_menu_controller.cc --- a/third_party/blink/renderer/core/page/context_menu_controller.cc +++ b/third_party/blink/renderer/core/page/context_menu_controller.cc -@@ -186,14 +186,16 @@ void ContextMenuController::DocumentDetached(Document* document) { +@@ -170,14 +170,16 @@ void ContextMenuController::DocumentDetached(Document* document) { } } @@ -465,7 +465,7 @@ diff --git a/third_party/blink/renderer/core/page/context_menu_controller.cc b/t mouse_event->SetDefaultHandled(); } -@@ -439,7 +441,8 @@ bool ContextMenuController::ShouldShowContextMenuFromTouch( +@@ -413,7 +415,8 @@ bool ContextMenuController::ShouldShowContextMenuFromTouch( bool ContextMenuController::ShowContextMenu(LocalFrame* frame, const PhysicalOffset& point, WebMenuSourceType source_type, @@ -475,7 +475,7 @@ diff --git a/third_party/blink/renderer/core/page/context_menu_controller.cc b/t // Displaying the context menu in this function is a big hack as we don't // have context, i.e. whether this is being invoked via a script or in // response to user input (Mouse event WM_RBUTTONDOWN, -@@ -465,6 +468,15 @@ bool ContextMenuController::ShowContextMenu(LocalFrame* frame, +@@ -436,6 +439,15 @@ bool ContextMenuController::ShowContextMenu(LocalFrame* frame, if (!result.InnerNodeOrImageMapImage()) return false; @@ -491,7 +491,7 @@ diff --git a/third_party/blink/renderer/core/page/context_menu_controller.cc b/t // Clear any previously set cached results if we are resetting the hit test // result. image_selection_cached_result_ = nullptr; -@@ -808,11 +820,13 @@ bool ContextMenuController::ShowContextMenu(LocalFrame* frame, +@@ -768,11 +780,13 @@ bool ContextMenuController::ShowContextMenu(LocalFrame* frame, data.form_renderer_id = GetFormRendererId(result); data.field_renderer_id = GetFieldRendererId(result); diff --git a/build/patches/00Clear-CORS-Preflight-Cache-on-clearing-data.patch b/build/patches/00Clear-CORS-Preflight-Cache-on-clearing-data.patch index 484b1d2e..c01bcc2d 100644 --- a/build/patches/00Clear-CORS-Preflight-Cache-on-clearing-data.patch +++ b/build/patches/00Clear-CORS-Preflight-Cache-on-clearing-data.patch @@ -54,7 +54,7 @@ diff --git a/services/network/cors/preflight_controller.cc b/services/network/co diff --git a/services/network/cors/preflight_controller.h b/services/network/cors/preflight_controller.h --- a/services/network/cors/preflight_controller.h +++ b/services/network/cors/preflight_controller.h -@@ -119,6 +119,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) PreflightController final { +@@ -138,6 +138,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) PreflightController final { const net::NetLogWithSource& net_log, bool acam_preflight_spec_conformant); @@ -78,7 +78,7 @@ diff --git a/services/network/cors/preflight_result.cc b/services/network/cors/p diff --git a/services/network/network_context.cc b/services/network/network_context.cc --- a/services/network/network_context.cc +++ b/services/network/network_context.cc -@@ -974,6 +974,8 @@ void NetworkContext::ClearHttpCache(base::Time start_time, +@@ -1018,6 +1018,8 @@ void NetworkContext::ClearHttpCache(base::Time start_time, base::BindOnce(&NetworkContext::OnHttpCacheCleared, base::Unretained(this), std::move(callback)))); diff --git a/build/patches/00Disable-BackForwardCache.patch b/build/patches/00Disable-BackForwardCache.patch index 94e8aa5e..9e245a62 100644 --- a/build/patches/00Disable-BackForwardCache.patch +++ b/build/patches/00Disable-BackForwardCache.patch @@ -9,7 +9,7 @@ Subject: Disable BackForwardCache diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc --- a/content/public/common/content_features.cc +++ b/content/public/common/content_features.cc -@@ -92,9 +92,9 @@ BASE_FEATURE(kBackgroundFetch, +@@ -84,9 +84,9 @@ BASE_FEATURE(kBackgroundFetch, base::FEATURE_ENABLED_BY_DEFAULT); // Enable using the BackForwardCache. @@ -20,7 +20,7 @@ diff --git a/content/public/common/content_features.cc b/content/public/common/c + "BackForwardCache", // always disabled + base::FEATURE_DISABLED_BY_DEFAULT); // in bromite - // Enables reporting ResourceTiming entries for document, who initiated a - // cancelled navigation in one of their