diff --git a/CHANGELOG.md b/CHANGELOG.md index b6c52bb9..3341510e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,12 @@ +# 87.0.4280.81 +* fix text fragment not disabled by default, unexpire flag (fixes https://github.com/bromite/bromite/issues/803) +* turn AImageReader off by default on ARM64 (fixes https://github.com/bromite/bromite/issues/814) +* fix issue with global autoplay settings (thanks to @uazo, https://github.com/bromite/bromite/pull/825) +* fix issues with user agent customization (thanks to @uazo, https://github.com/bromite/bromite/pull/823) +* updated zh_CN translations (thanks to @zhmars, https://github.com/bromite/bromite/pull/821) + # 87.0.4280.68 * user agent customization (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/798) -* fix for Qualcomm AImageReader crashes on A9 (fixes https://github.com/bromite/bromite/issues/814) -* fix disable-scroll-to-text-fragment patch (fixes https://github.com/bromite/bromite/issues/803) * fix for intent handling for local apps on Android 11 (https://github.com/bromite/bromite/pull/816) # 87.0.4280.67 diff --git a/README.md b/README.md index a3f1ea5e..f4a4d125 100644 --- a/README.md +++ b/README.md @@ -86,6 +86,7 @@ Flags which have been retired from upstream Chromium but are still available in * `#enable-search-ready-omnibox` * `#darken-websites-checkbox-in-themes-setting` * `#simplified-ntp` +* `#enable-text-fragment-anchor` New flags: diff --git a/build/RELEASE b/build/RELEASE index 35cf04a7..ad1f54b4 100644 --- a/build/RELEASE +++ b/build/RELEASE @@ -1 +1 @@ -87.0.4280.68 +87.0.4280.81 diff --git a/build/bromite_patches_list.txt b/build/bromite_patches_list.txt index 25b64386..08028a57 100644 --- a/build/bromite_patches_list.txt +++ b/build/bromite_patches_list.txt @@ -138,7 +138,6 @@ Disable-support-for-RAR-files-inspection.patch Add-history-support-in-incognito-mode.patch Enable-darken-websites-checkbox-in-themes.patch Remove-blocklisted-URLs-upon-bookmark-creation.patch -Disable-scroll-to-text-fragment.patch Disable-the-DIAL-repeating-discovery.patch Block-all-connection-requests-with-qjz9zk-in-the-domain-name-or-with-a-trk-scheme.patch Hardening-against-incognito-mode-detection.patch @@ -149,4 +148,5 @@ User-agent-customization.patch Restore-Simplified-NTP-launch.patch Revert-the-removal-of-an-option-to-block-autoplay.patch android-upstream-missed-manifest-changes-for-Q-R.patch +Disable-text-fragments-by-default.patch Automated-domain-substitution.patch diff --git a/build/patches/AImageReader-CFI-crash-mitigations.patch b/build/patches/AImageReader-CFI-crash-mitigations.patch index c703689e..5ccbfa99 100644 --- a/build/patches/AImageReader-CFI-crash-mitigations.patch +++ b/build/patches/AImageReader-CFI-crash-mitigations.patch @@ -19,18 +19,19 @@ See discussions at: * https://github.com/bromite/bromite/issues/445 * https://github.com/bromite/bromite/issues/814 --- - base/android/android_image_reader_compat.cc | 8 +++++- - base/android/android_image_reader_compat.h | 4 +++ - gpu/config/gpu_driver_bug_list.json | 32 +++++++++++++++++++++ - gpu/config/gpu_finch_features.cc | 8 ++++++ + base/android/android_image_reader_compat.cc | 8 +++++++- + base/android/android_image_reader_compat.h | 4 ++++ + chrome/browser/flag-metadata.json | 2 +- + gpu/config/gpu_driver_bug_list.json | 16 ++++++++++++++++ + gpu/config/gpu_finch_features.cc | 10 +++++++++- gpu/config/gpu_finch_features.h | 1 + - gpu/config/gpu_util.cc | 8 ++++++ + gpu/config/gpu_util.cc | 8 ++++++++ gpu/config/gpu_workaround_list.txt | 1 + - gpu/ipc/service/gpu_init.cc | 11 +++++++ - gpu/ipc/service/stream_texture_android.cc | 11 ++++++- - media/base/media_switches.cc | 8 ++++++ + gpu/ipc/service/gpu_init.cc | 5 +++++ + gpu/ipc/service/stream_texture_android.cc | 11 ++++++++++- + media/base/media_switches.cc | 4 ++++ media/base/media_switches.h | 1 + - 11 files changed, 91 insertions(+), 2 deletions(-) + 12 files changed, 67 insertions(+), 4 deletions(-) diff --git a/base/android/android_image_reader_compat.cc b/base/android/android_image_reader_compat.cc --- a/base/android/android_image_reader_compat.cc @@ -79,10 +80,22 @@ diff --git a/base/android/android_image_reader_compat.h b/base/android/android_i friend class base::NoDestructor; AndroidImageReader(); +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 +@@ -1681,7 +1681,7 @@ + { + "name": "enable-image-reader", + "owners": [ "vikassoni", "khushalsagar" ], +- "expiry_milestone": 90 ++ "expiry_milestone": -1 + }, + { + "name": "enable-immersive-fullscreen-toolbar", diff --git a/gpu/config/gpu_driver_bug_list.json b/gpu/config/gpu_driver_bug_list.json --- a/gpu/config/gpu_driver_bug_list.json +++ b/gpu/config/gpu_driver_bug_list.json -@@ -3287,6 +3287,38 @@ +@@ -3287,6 +3287,22 @@ "dont_delete_source_texture_for_egl_image" ] }, @@ -101,22 +114,6 @@ diff --git a/gpu/config/gpu_driver_bug_list.json b/gpu/config/gpu_driver_bug_lis + "features": [ + "disable_aimagereader" + ] -+ }, -+ { -+ "id":330, -+ "cr_bugs": [1051705], -+ "description": "Disable AImageReader on Qualcomm GPUs", -+ "os": { -+ "type": "android", -+ "version": { -+ "op": "<", -+ "value": "10" -+ } -+ }, -+ "gl_vendor": "Qualcomm.*", -+ "features": [ -+ "disable_aimagereader" -+ ] + }, { "id": 336, @@ -124,21 +121,30 @@ diff --git a/gpu/config/gpu_driver_bug_list.json b/gpu/config/gpu_driver_bug_lis diff --git a/gpu/config/gpu_finch_features.cc b/gpu/config/gpu_finch_features.cc --- a/gpu/config/gpu_finch_features.cc +++ b/gpu/config/gpu_finch_features.cc -@@ -13,6 +13,14 @@ +@@ -13,6 +13,10 @@ namespace features { +// Use android AImageReader when playing videos with MediaPlayer. +const base::Feature kAImageReaderMediaPlayer{"AImageReaderMediaPlayer", ++ base::FEATURE_ENABLED_BY_DEFAULT}; ++ + #if defined(OS_ANDROID) + // Used to limit GL version to 2.0 for skia raster on Android. + const base::Feature kUseGles2ForOopR{"UseGles2ForOopR", +@@ -26,7 +30,11 @@ const base::Feature kAndroidSurfaceControl{"AndroidSurfaceControl", + + // Use AImageReader for MediaCodec and MediaPlyer on android. + const base::Feature kAImageReader{"AImageReader", +- base::FEATURE_ENABLED_BY_DEFAULT}; +#ifdef ARCH_CPU_ARM64 + base::FEATURE_DISABLED_BY_DEFAULT}; +#else + base::FEATURE_ENABLED_BY_DEFAULT}; +#endif -+ - #if defined(OS_ANDROID) - // Used to limit GL version to 2.0 for skia raster on Android. - const base::Feature kUseGles2ForOopR{"UseGles2ForOopR", + #endif + + // Enable GPU Rasterization by default. This can still be overridden by diff --git a/gpu/config/gpu_finch_features.h b/gpu/config/gpu_finch_features.h --- a/gpu/config/gpu_finch_features.h +++ b/gpu/config/gpu_finch_features.h @@ -189,31 +195,18 @@ diff --git a/gpu/config/gpu_workaround_list.txt b/gpu/config/gpu_workaround_list diff --git a/gpu/ipc/service/gpu_init.cc b/gpu/ipc/service/gpu_init.cc --- a/gpu/ipc/service/gpu_init.cc +++ b/gpu/ipc/service/gpu_init.cc -@@ -727,6 +727,12 @@ void GpuInit::InitializeInProcess(base::CommandLine* command_line, - AdjustInfoToSwiftShader(); +@@ -467,6 +467,11 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandLine* command_line, + } } -+#if defined(OS_ANDROID) -+ // Disable AImageReader if the workaround is enabled. -+ if (gpu_feature_info_.IsWorkaroundEnabled(DISABLE_AIMAGEREADER)) { -+ base::android::AndroidImageReader::DisableSupport(); -+ } -+#endif - #if defined(USE_OZONE) - if (features::IsUsingOzonePlatform()) { - const std::vector -@@ -746,6 +752,11 @@ void GpuInit::InitializeInProcess(base::CommandLine* command_line, - gl::DirectCompositionSurfaceWin::DisableDecodeSwapChain(); - #endif - + // Disable AImageReader if the workaround is enabled. + if (gpu_feature_info_.IsWorkaroundEnabled(DISABLE_AIMAGEREADER)) { + base::android::AndroidImageReader::DisableSupport(); + } + - UMA_HISTOGRAM_ENUMERATION("GPU.GLImplementation", gl::GetGLImplementation()); - } - #endif // OS_ANDROID + if (gpu_feature_info_.status_values[GPU_FEATURE_TYPE_VULKAN] != + kGpuFeatureStatusEnabled || + !InitializeVulkan()) { diff --git a/gpu/ipc/service/stream_texture_android.cc b/gpu/ipc/service/stream_texture_android.cc --- a/gpu/ipc/service/stream_texture_android.cc +++ b/gpu/ipc/service/stream_texture_android.cc @@ -245,17 +238,13 @@ diff --git a/gpu/ipc/service/stream_texture_android.cc b/gpu/ipc/service/stream_ diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc --- a/media/base/media_switches.cc +++ b/media/base/media_switches.cc -@@ -566,6 +566,14 @@ const base::Feature kMediaDrmPreprovisioning{"MediaDrmPreprovisioning", +@@ -566,6 +566,10 @@ const base::Feature kMediaDrmPreprovisioning{"MediaDrmPreprovisioning", const base::Feature kMediaDrmPreprovisioningAtStartup{ "MediaDrmPreprovisioningAtStartup", base::FEATURE_ENABLED_BY_DEFAULT}; +// Enables the Android Image Reader path for Video decoding(for AVDA and MCVD) +const base::Feature kAImageReaderVideoOutput{"AImageReaderVideoOutput", -+#ifdef ARCH_CPU_ARM64 -+ base::FEATURE_DISABLED_BY_DEFAULT}; -+#else + base::FEATURE_ENABLED_BY_DEFAULT}; -+#endif + // Prevents using SurfaceLayer for videos. This is meant to be used by embedders // that cannot support SurfaceLayer at the moment. diff --git a/build/patches/Add-a-flag-to-allow-screenshots-in-Incognito-mode.patch b/build/patches/Add-a-flag-to-allow-screenshots-in-Incognito-mode.patch index cd89ee14..6e490a48 100644 --- a/build/patches/Add-a-flag-to-allow-screenshots-in-Incognito-mode.patch +++ b/build/patches/Add-a-flag-to-allow-screenshots-in-Incognito-mode.patch @@ -17,7 +17,7 @@ See also: 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 -@@ -5163,6 +5163,12 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5169,6 +5169,12 @@ const FeatureEntry kFeatureEntries[] = { kOsAll, FEATURE_VALUE_TYPE(features::kEnableAmbientAuthenticationInIncognito)}, diff --git a/build/patches/Add-flag-to-configure-maximum-connections-per-host.patch b/build/patches/Add-flag-to-configure-maximum-connections-per-host.patch index 3d5e202d..7e987f51 100644 --- a/build/patches/Add-flag-to-configure-maximum-connections-per-host.patch +++ b/build/patches/Add-flag-to-configure-maximum-connections-per-host.patch @@ -31,7 +31,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc // Ensure that all effective connection types returned by Network Quality // Estimator (NQE) are also exposed via flags. static_assert(net::EFFECTIVE_CONNECTION_TYPE_LAST + 2 == -@@ -3473,6 +3478,9 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3479,6 +3484,9 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kAndroidPictureInPictureAPIName, flag_descriptions::kAndroidPictureInPictureAPIDescription, kOsAndroid, FEATURE_VALUE_TYPE(media::kPictureInPictureAPI)}, diff --git a/build/patches/Add-flag-to-disable-IPv6-probes.patch b/build/patches/Add-flag-to-disable-IPv6-probes.patch index bdfeb7b9..4f7fdee8 100644 --- a/build/patches/Add-flag-to-disable-IPv6-probes.patch +++ b/build/patches/Add-flag-to-disable-IPv6-probes.patch @@ -16,7 +16,7 @@ Subject: Add flag to disable IPv6 probes 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 -@@ -4417,6 +4417,11 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4423,6 +4423,11 @@ const FeatureEntry kFeatureEntries[] = { #endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || // defined(OS_CHROMEOS) diff --git a/build/patches/Add-flags-to-disable-device-motion-orientation-APIs.patch b/build/patches/Add-flags-to-disable-device-motion-orientation-APIs.patch index 37c20b67..2d8dcd9e 100644 --- a/build/patches/Add-flags-to-disable-device-motion-orientation-APIs.patch +++ b/build/patches/Add-flags-to-disable-device-motion-orientation-APIs.patch @@ -83,7 +83,7 @@ diff --git a/content/child/runtime_features.cc b/content/child/runtime_features. 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 -@@ -851,6 +851,16 @@ const base::Feature kWebOtpBackend{"kWebOtpBackend", +@@ -856,6 +856,16 @@ const base::Feature kWebOtpBackend{"kWebOtpBackend", // TODO(rouslan): Remove this. const base::Feature kWebPayments{"WebPayments", base::FEATURE_ENABLED_BY_DEFAULT}; @@ -103,7 +103,7 @@ diff --git a/content/public/common/content_features.cc b/content/public/common/c diff --git a/content/public/common/content_features.h b/content/public/common/content_features.h --- a/content/public/common/content_features.h +++ b/content/public/common/content_features.h -@@ -182,6 +182,8 @@ CONTENT_EXPORT extern const base::Feature kWebXrArModule; +@@ -183,6 +183,8 @@ CONTENT_EXPORT extern const base::Feature kWebXrArModule; CONTENT_EXPORT extern const base::Feature kWebXrHitTest; CONTENT_EXPORT extern const base::Feature kWebXrIncubations; diff --git a/build/patches/Add-option-to-configure-the-ad-blocker-filters-URL.patch b/build/patches/Add-option-to-configure-the-ad-blocker-filters-URL.patch index acaa5514..d83b3da6 100644 --- a/build/patches/Add-option-to-configure-the-ad-blocker-filters-URL.patch +++ b/build/patches/Add-option-to-configure-the-ad-blocker-filters-URL.patch @@ -359,7 +359,7 @@ new file mode 100644 diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd -@@ -10210,6 +10210,16 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -10208,6 +10208,16 @@ Please help our engineers fix this problem. Tell us what happened right before y Never show this again. diff --git a/build/patches/Automated-domain-substitution.patch b/build/patches/Automated-domain-substitution.patch index 261d8058..a3994ae1 100644 --- a/build/patches/Automated-domain-substitution.patch +++ b/build/patches/Automated-domain-substitution.patch @@ -1021,7 +1021,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc const FeatureEntry::Choice kPassiveListenersChoices[] = { {flags_ui::kGenericExperimentChoiceDefault, "", ""}, -@@ -3302,7 +3302,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3308,7 +3308,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kSyncSandboxDescription, kOsAll, SINGLE_VALUE_TYPE_AND_VALUE( switches::kSyncServiceURL, @@ -1030,7 +1030,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc #if !defined(OS_ANDROID) {"load-media-router-component-extension", flag_descriptions::kLoadMediaRouterComponentExtensionName, -@@ -3552,7 +3552,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3558,7 +3558,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kSetMarketUrlForTestingName, flag_descriptions::kSetMarketUrlForTestingDescription, kOsAndroid, SINGLE_VALUE_TYPE_AND_VALUE(switches::kMarketUrlForTesting, @@ -14468,7 +14468,7 @@ diff --git a/content/shell/android/java/src/org/chromium/content_shell/ShellMana diff --git a/device/bluetooth/bluetooth_adapter_mac.mm b/device/bluetooth/bluetooth_adapter_mac.mm --- a/device/bluetooth/bluetooth_adapter_mac.mm +++ b/device/bluetooth/bluetooth_adapter_mac.mm -@@ -44,7 +44,7 @@ extern "C" { +@@ -49,7 +49,7 @@ extern "C" { // Using this API has the same effect as turning Bluetooth on or off using the // macOS System Preferences [4], and will effect all adapters. // diff --git a/build/patches/Bromite-AdBlockUpdaterService.patch b/build/patches/Bromite-AdBlockUpdaterService.patch index 21e12c56..14fa4b6e 100644 --- a/build/patches/Bromite-AdBlockUpdaterService.patch +++ b/build/patches/Bromite-AdBlockUpdaterService.patch @@ -169,7 +169,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch #include "components/page_load_metrics/browser/metrics_web_contents_observer.h" #include "components/payments/content/payment_request_display_manager.h" #include "components/performance_manager/embedder/performance_manager_registry.h" -@@ -3925,16 +3923,6 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation( +@@ -3935,16 +3933,6 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation( content::NavigationHandle* handle) { std::vector> throttles; @@ -186,7 +186,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch #if BUILDFLAG(ENABLE_PLUGINS) MaybeAddThrottle(FlashDownloadInterception::MaybeCreateThrottleFor(handle), &throttles); -@@ -4048,10 +4036,6 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation( +@@ -4058,10 +4046,6 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation( &throttles); #endif diff --git a/build/patches/Disable-safe-browsing.patch b/build/patches/Disable-safe-browsing.patch index 4323174c..e1b4a93f 100644 --- a/build/patches/Disable-safe-browsing.patch +++ b/build/patches/Disable-safe-browsing.patch @@ -653,7 +653,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch }; #if BUILDFLAG(ENABLE_EXTENSIONS) -@@ -1423,7 +1417,9 @@ void ChromeContentBrowserClient::PostAfterStartupTask( +@@ -1433,7 +1427,9 @@ void ChromeContentBrowserClient::PostAfterStartupTask( InitNetworkContextsParentDirectory(); DCHECK_CURRENTLY_ON(BrowserThread::UI); @@ -663,7 +663,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch } bool ChromeContentBrowserClient::IsBrowserStartupComplete() { -@@ -2136,7 +2132,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches( +@@ -2146,7 +2142,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches( } #elif defined(OS_POSIX) #if defined(OS_ANDROID) @@ -672,7 +672,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch #else bool enable_crash_reporter = false; if (crash_reporter::IsCrashpadEnabled()) { -@@ -2260,6 +2256,9 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches( +@@ -2270,6 +2266,9 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches( instant_service->IsInstantProcess(process->GetID())) { command_line->AppendSwitch(switches::kInstantProcess); } @@ -682,7 +682,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch #endif if (prefs->HasPrefPath(prefs::kAllowDinosaurEasterEgg) && -@@ -4084,14 +4083,13 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation( +@@ -4094,14 +4093,13 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation( &throttles); #endif @@ -699,7 +699,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch #if defined(OS_WIN) || defined(OS_MAC) || \ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) -@@ -5203,6 +5201,7 @@ ChromeContentBrowserClient::GetSafeBrowsingUrlCheckerDelegate( +@@ -5213,6 +5211,7 @@ ChromeContentBrowserClient::GetSafeBrowsingUrlCheckerDelegate( bool should_check_on_sb_disabled) { DCHECK_CURRENTLY_ON(BrowserThread::IO); @@ -707,7 +707,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch // Should not bypass safe browsing check if the check is for enterprise // lookup. if (!safe_browsing_enabled_for_profile && !should_check_on_sb_disabled) -@@ -5217,6 +5216,9 @@ ChromeContentBrowserClient::GetSafeBrowsingUrlCheckerDelegate( +@@ -5227,6 +5226,9 @@ ChromeContentBrowserClient::GetSafeBrowsingUrlCheckerDelegate( } return safe_browsing_url_checker_delegate_; diff --git a/build/patches/Disable-scroll-to-text-fragment.patch b/build/patches/Disable-scroll-to-text-fragment.patch deleted file mode 100644 index 821111c9..00000000 --- a/build/patches/Disable-scroll-to-text-fragment.patch +++ /dev/null @@ -1,107 +0,0 @@ -From: csagan5 <32685696+csagan5@users.noreply.github.com> -Date: Sat, 22 Aug 2020 12:46:20 +0200 -Subject: Disable scroll-to-text-fragment - ---- - chrome/browser/chrome_content_browser_client.cc | 4 ++-- - chrome/browser/ui/prefs/prefs_tab_helper.cc | 2 +- - content/browser/renderer_host/render_process_host_impl.cc | 2 +- - content/child/runtime_features.cc | 4 ++-- - content/public/common/content_switches.cc | 4 ++-- - content/public/common/content_switches.h | 2 +- - third_party/blink/common/features.cc | 2 +- - 7 files changed, 10 insertions(+), 10 deletions(-) - -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 -@@ -2278,8 +2278,8 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches( - } - - if (prefs->HasPrefPath(prefs::kScrollToTextFragmentEnabled) && -- !prefs->GetBoolean(prefs::kScrollToTextFragmentEnabled)) { -- command_line->AppendSwitch(switches::kDisableScrollToTextFragment); -+ prefs->GetBoolean(prefs::kScrollToTextFragmentEnabled)) { -+ command_line->AppendSwitch(switches::kEnableScrollToTextFragment); - } - - if (prefs->HasPrefPath(prefs::kAppCacheForceEnabled) && -diff --git a/chrome/browser/ui/prefs/prefs_tab_helper.cc b/chrome/browser/ui/prefs/prefs_tab_helper.cc ---- a/chrome/browser/ui/prefs/prefs_tab_helper.cc -+++ b/chrome/browser/ui/prefs/prefs_tab_helper.cc -@@ -357,7 +357,7 @@ void PrefsTabHelper::RegisterProfilePrefs( - prefs::kEnableReferrers, - !base::FeatureList::IsEnabled(features::kNoReferrers)); - registry->RegisterBooleanPref(prefs::kEnableEncryptedMedia, true); -- registry->RegisterBooleanPref(prefs::kScrollToTextFragmentEnabled, true); -+ registry->RegisterBooleanPref(prefs::kScrollToTextFragmentEnabled, false); - #if defined(OS_ANDROID) - registry->RegisterDoublePref(prefs::kWebKitFontScaleFactor, 1.0); - registry->RegisterBooleanPref(prefs::kWebKitForceEnableZoom, -diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc ---- a/content/browser/renderer_host/render_process_host_impl.cc -+++ b/content/browser/renderer_host/render_process_host_impl.cc -@@ -3342,7 +3342,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer( - switches::kDisablePermissionsAPI, - switches::kDisablePresentationAPI, - switches::kDisableRTCSmoothnessAlgorithm, -- switches::kDisableScrollToTextFragment, -+ switches::kEnableScrollToTextFragment, - switches::kDisableSharedWorkers, - switches::kDisableSkiaRuntimeOpts, - switches::kDisableSpeechAPI, -diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.cc ---- a/content/child/runtime_features.cc -+++ b/content/child/runtime_features.cc -@@ -442,8 +442,8 @@ void SetRuntimeFeaturesFromCommandLine(const base::CommandLine& command_line) { - {wrf::EnablePermissionsAPI, switches::kDisablePermissionsAPI, false}, - {wrf::EnableWebGPU, switches::kEnableUnsafeWebGPU, true}, - {wrf::EnablePresentationAPI, switches::kDisablePresentationAPI, false}, -- {wrf::EnableTextFragmentAnchor, switches::kDisableScrollToTextFragment, -- false}, -+ {wrf::EnableTextFragmentAnchor, switches::kEnableScrollToTextFragment, -+ true}, - {wrf::EnableRemotePlaybackAPI, switches::kDisableRemotePlaybackAPI, - false}, - {wrf::EnableTimerThrottlingForBackgroundTabs, -diff --git a/content/public/common/content_switches.cc b/content/public/common/content_switches.cc ---- a/content/public/common/content_switches.cc -+++ b/content/public/common/content_switches.cc -@@ -884,8 +884,8 @@ const char kWebRtcStunProbeTrialParameter[] = "webrtc-stun-probe-trial"; - // without restarting the browser and relaunching without this flag. - const char kWebRtcLocalEventLogging[] = "webrtc-event-logging"; - --// This switch disables the ScrollToTextFragment feature. --const char kDisableScrollToTextFragment[] = "disable-scroll-to-text-fragment"; -+// This switch enables the ScrollToTextFragment feature. -+const char kEnableScrollToTextFragment[] = "enable-scroll-to-text-fragment"; - - // Forcibly enable and select the specified runtime for webxr. - // Note that this provides an alternative means of enabling a runtime, and will -diff --git a/content/public/common/content_switches.h b/content/public/common/content_switches.h ---- a/content/public/common/content_switches.h -+++ b/content/public/common/content_switches.h -@@ -240,7 +240,7 @@ extern const char kWebRtcMaxCaptureFramerate[]; - extern const char kWebRtcMaxCpuConsumptionPercentage[]; - CONTENT_EXPORT extern const char kWebRtcStunProbeTrialParameter[]; - CONTENT_EXPORT extern const char kWebRtcLocalEventLogging[]; --CONTENT_EXPORT extern const char kDisableScrollToTextFragment[]; -+CONTENT_EXPORT extern const char kEnableScrollToTextFragment[]; - - CONTENT_EXPORT extern const char kWebXrForceRuntime[]; - CONTENT_EXPORT extern const char kWebXrRuntimeNone[]; -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 -@@ -286,7 +286,7 @@ const base::Feature kStorageAccessAPI{"StorageAccessAPI", - - // Enable text snippets in URL fragments. https://crbug.com/919204. - const base::Feature kTextFragmentAnchor{"TextFragmentAnchor", -- base::FEATURE_ENABLED_BY_DEFAULT}; -+ base::FEATURE_DISABLED_BY_DEFAULT}; - - // File handling integration. https://crbug.com/829689 - const base::Feature kFileHandlingAPI{"FileHandlingAPI", --- -2.17.1 - diff --git a/build/patches/Disable-some-signed-exchange-features.patch b/build/patches/Disable-some-signed-exchange-features.patch index ebc2631e..40b0aa91 100644 --- a/build/patches/Disable-some-signed-exchange-features.patch +++ b/build/patches/Disable-some-signed-exchange-features.patch @@ -9,7 +9,7 @@ Subject: Disable some signed exchange features 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 -@@ -626,7 +626,7 @@ const base::Feature kSignedExchangePrefetchCacheForNavigations{ +@@ -631,7 +631,7 @@ const base::Feature kSignedExchangePrefetchCacheForNavigations{ // Signed Exchange Reporting for distributors // https://www.chromestatus.com/features/5687904902840320 const base::Feature kSignedExchangeReportingForDistributors{ @@ -18,7 +18,7 @@ diff --git a/content/public/common/content_features.cc b/content/public/common/c // Subresource prefetching+loading via Signed HTTP Exchange // https://www.chromestatus.com/features/5126805474246656 -@@ -636,7 +636,7 @@ const base::Feature kSignedExchangeSubresourcePrefetch{ +@@ -641,7 +641,7 @@ const base::Feature kSignedExchangeSubresourcePrefetch{ // Origin-Signed HTTP Exchanges (for WebPackage Loading) // https://www.chromestatus.com/features/5745285984681984 const base::Feature kSignedHTTPExchange{"SignedHTTPExchange", diff --git a/build/patches/Disable-text-fragments-by-default.patch b/build/patches/Disable-text-fragments-by-default.patch new file mode 100644 index 00000000..520bb473 --- /dev/null +++ b/build/patches/Disable-text-fragments-by-default.patch @@ -0,0 +1,160 @@ +From: csagan5 <32685696+csagan5@users.noreply.github.com> +Date: Sat, 22 Aug 2020 12:46:20 +0200 +Subject: Disable text fragments by default + +Revert "[Text Fragment] Unflag fragment directive removal." +--- + chrome/browser/about_flags.cc | 1 + + chrome/browser/flag-metadata.json | 2 +- + chrome/browser/ui/prefs/prefs_tab_helper.cc | 2 +- + content/child/runtime_features.cc | 1 + + third_party/blink/common/features.cc | 2 +- + .../blink/renderer/core/dom/document.cc | 5 ++++ + .../text_fragment_anchor_metrics_test.cc | 29 +++++++------------ + .../platform/runtime_enabled_features.json5 | 3 +- + 8 files changed, 21 insertions(+), 24 deletions(-) + +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 +@@ -5239,6 +5239,7 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kEnableCSSOMViewScrollCoordinatesDescription, kOsAll, + FEATURE_VALUE_TYPE(blink::features::kCSSOMViewScrollCoordinates)}, + ++ // will override runtime text fragment identifiers setting too + {"enable-text-fragment-anchor", + flag_descriptions::kEnableTextFragmentAnchorName, + flag_descriptions::kEnableTextFragmentAnchorDescription, kOsAll, +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 +@@ -2221,7 +2221,7 @@ + { + "name": "enable-text-fragment-anchor", + "owners": [ "bokan", "input-dev" ], +- "expiry_milestone": 83 ++ "expiry_milestone": -1 + }, + { + "name": "enable-tls13-early-data", +diff --git a/chrome/browser/ui/prefs/prefs_tab_helper.cc b/chrome/browser/ui/prefs/prefs_tab_helper.cc +--- a/chrome/browser/ui/prefs/prefs_tab_helper.cc ++++ b/chrome/browser/ui/prefs/prefs_tab_helper.cc +@@ -357,7 +357,7 @@ void PrefsTabHelper::RegisterProfilePrefs( + prefs::kEnableReferrers, + !base::FeatureList::IsEnabled(features::kNoReferrers)); + registry->RegisterBooleanPref(prefs::kEnableEncryptedMedia, true); +- registry->RegisterBooleanPref(prefs::kScrollToTextFragmentEnabled, true); ++ registry->RegisterBooleanPref(prefs::kScrollToTextFragmentEnabled, false); + #if defined(OS_ANDROID) + registry->RegisterDoublePref(prefs::kWebKitFontScaleFactor, 1.0); + registry->RegisterBooleanPref(prefs::kWebKitForceEnableZoom, +diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.cc +--- a/content/child/runtime_features.cc ++++ b/content/child/runtime_features.cc +@@ -269,6 +269,7 @@ void SetRuntimeFeaturesFromChromiumFeatures() { + {wf::EnableImplicitRootScroller, blink::features::kImplicitRootScroller}, + {wf::EnableCSSOMViewScrollCoordinates, + blink::features::kCSSOMViewScrollCoordinates}, ++ // will set the TextFragmentIdentifiers runtime feature + {wf::EnableTextFragmentAnchor, blink::features::kTextFragmentAnchor}, + {wf::EnableBackgroundFetch, features::kBackgroundFetch}, + {wf::EnableForcedColors, features::kForcedColors}, +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 +@@ -286,7 +286,7 @@ const base::Feature kStorageAccessAPI{"StorageAccessAPI", + + // Enable text snippets in URL fragments. https://crbug.com/919204. + const base::Feature kTextFragmentAnchor{"TextFragmentAnchor", +- base::FEATURE_ENABLED_BY_DEFAULT}; ++ base::FEATURE_DISABLED_BY_DEFAULT}; + + // File handling integration. https://crbug.com/829689 + const base::Feature kFileHandlingAPI{"FileHandlingAPI", +diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink/renderer/core/dom/document.cc +--- a/third_party/blink/renderer/core/dom/document.cc ++++ b/third_party/blink/renderer/core/dom/document.cc +@@ -4432,6 +4432,10 @@ void Document::SetURL(const KURL& url) { + } + } + ++ // If text fragment identifiers are enabled, we strip the fragment directive ++ // from the URL fragment. ++ // E.g. "#id:~:text=a" --> "#id" ++ if (RuntimeEnabledFeatures::TextFragmentIdentifiersEnabled(domWindow())) { + // Strip the fragment directive from the URL fragment. E.g. "#id:~:text=a" + // --> "#id". See https://github.com/WICG/scroll-to-text-fragment. + String fragment = new_url.FragmentIdentifier(); +@@ -4445,6 +4449,7 @@ void Document::SetURL(const KURL& url) { + else + new_url.SetFragmentIdentifier(fragment.Substring(0, start_pos)); + } ++ } + + url_ = new_url; + access_entry_from_url_ = nullptr; +diff --git a/third_party/blink/renderer/core/page/scrolling/text_fragment_anchor_metrics_test.cc b/third_party/blink/renderer/core/page/scrolling/text_fragment_anchor_metrics_test.cc +--- a/third_party/blink/renderer/core/page/scrolling/text_fragment_anchor_metrics_test.cc ++++ b/third_party/blink/renderer/core/page/scrolling/text_fragment_anchor_metrics_test.cc +@@ -952,34 +952,25 @@ TEST_P(TextFragmentRelatedMetricTest, ElementIdSuccessFailureCounts) { + // result of the element-id fragment if a text directive is successfully + // parsed. If the feature is off we treat the text directive as an element-id + // and should count the result. ++ const int kUncountedOrNotFound = GetParam() ? kUncounted : kNotFound; + const int kUncountedOrFound = GetParam() ? kUncounted : kFound; + +- // Note: We'll strip the fragment directive (i.e. anything after :~:) leaving +- // just the element anchor. The fragment directive stripping behavior is now +- // shipped unflagged so it should always be performed. ++ // When the TextFragmentAnchors feature is on, we'll strip the fragment ++ // directive (i.e. anything after :~:) leaving just the element anchor. ++ const int kFoundIfDirectiveStripped = GetParam() ? kFound : kNotFound; + + Vector> test_cases = { + {"", kUncounted}, + {"#element", kFound}, + {"#doesntExist", kNotFound}, +- // `:~:foo` will be stripped so #element will be found and #doesntexist +- // ##element will be not found. +- {"#element:~:foo", kFound}, ++ {"#element:~:foo", kFoundIfDirectiveStripped}, + {"#doesntexist:~:foo", kNotFound}, + {"##element", kNotFound}, +- // If the feature is on, `:~:text=` will parse so we shouldn't count. +- // Otherwise, it'll just be stripped so #element will be found. +- {"#element:~:text=doesntexist", kUncountedOrFound}, +- {"#element:~:text=page", kUncountedOrFound}, +- // If the feature is on, `:~:text` is parsed so we don't count. If it's +- // off the entire fragment is a directive that's stripped so no search is +- // performed either. +- {"#:~:text=doesntexist", kUncounted}, +- {"#:~:text=page", kUncounted}, +- {"#:~:text=name", kUncounted}, +- // If the feature is enabled, `:~:text` parses and we don't count the +- // element-id. If the feature is off, we still strip the :~: directive +- // and the remaining fragment does match an element id. ++ {"#element:~:text=doesntexist", kUncountedOrNotFound}, ++ {"#element:~:text=page", kUncountedOrNotFound}, ++ {"#:~:text=doesntexist", kUncountedOrNotFound}, ++ {"#:~:text=page", kUncountedOrNotFound}, ++ {"#:~:text=name", kUncountedOrFound}, + {"#element:~:text=name", kUncountedOrFound}}; + + const int kNotFoundSample = 0; +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 +@@ -1862,8 +1862,7 @@ + }, + { + name: "TextFragmentIdentifiers", +- origin_trial_feature_name: "TextFragmentIdentifiers", +- status: "stable", ++ origin_trial_feature_name: "TextFragmentIdentifiers" + }, + { + name: "ThirdPartyOriginTrials", +-- +2.17.1 + diff --git a/build/patches/Enable-darken-websites-checkbox-in-themes.patch b/build/patches/Enable-darken-websites-checkbox-in-themes.patch index 8b8467d9..ab6e3449 100644 --- a/build/patches/Enable-darken-websites-checkbox-in-themes.patch +++ b/build/patches/Enable-darken-websites-checkbox-in-themes.patch @@ -11,7 +11,7 @@ Unexpire #darken-websites-checkbox-in-themes-setting 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 -@@ -908,7 +908,7 @@ +@@ -913,7 +913,7 @@ { "name": "disable-keepalive-fetch", "owners": [ "yhirano" ], diff --git a/build/patches/Enable-legacy-TLS-interstitital-warning.patch b/build/patches/Enable-legacy-TLS-interstitital-warning.patch index 3e9e860d..7df7b495 100644 --- a/build/patches/Enable-legacy-TLS-interstitital-warning.patch +++ b/build/patches/Enable-legacy-TLS-interstitital-warning.patch @@ -15,7 +15,7 @@ Expose show-legacy-tls-warnings flag on Android as well 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 -@@ -6020,11 +6020,9 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6026,11 +6026,9 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kElasticOverscrollWin)}, #endif diff --git a/build/patches/Modify-default-preferences.patch b/build/patches/Modify-default-preferences.patch index 612f2ad8..fc82b36e 100644 --- a/build/patches/Modify-default-preferences.patch +++ b/build/patches/Modify-default-preferences.patch @@ -32,7 +32,7 @@ diff --git a/chrome/browser/background/background_mode_manager.cc b/chrome/brows 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 -@@ -1304,7 +1304,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs( +@@ -1314,7 +1314,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs( void ChromeContentBrowserClient::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false); diff --git a/build/patches/Remove-dependency-on-fido-iid-instantapps-location.patch b/build/patches/Remove-dependency-on-fido-iid-instantapps-location.patch index f14cab92..66dc36a3 100644 --- a/build/patches/Remove-dependency-on-fido-iid-instantapps-location.patch +++ b/build/patches/Remove-dependency-on-fido-iid-instantapps-location.patch @@ -345,7 +345,7 @@ diff --git a/components/gcm_driver/instance_id/android/java/src/org/chromium/com 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 -@@ -800,7 +800,7 @@ const base::Feature kWebContentsOcclusion { +@@ -805,7 +805,7 @@ const base::Feature kWebContentsOcclusion { // Controls whether the WebAuthentication API is enabled: // https://w3c.github.io/webauthn const base::Feature kWebAuth{"WebAuthentication", diff --git a/build/patches/Restore-Search-Ready-Omnibox-flag.patch b/build/patches/Restore-Search-Ready-Omnibox-flag.patch index bdaf55a3..671e8d32 100644 --- a/build/patches/Restore-Search-Ready-Omnibox-flag.patch +++ b/build/patches/Restore-Search-Ready-Omnibox-flag.patch @@ -54,7 +54,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggest 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 -@@ -3023,6 +3023,9 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3029,6 +3029,9 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kAndroidAutofillAccessibilityName, flag_descriptions::kAndroidAutofillAccessibilityDescription, kOsAndroid, FEATURE_VALUE_TYPE(features::kAndroidAutofillAccessibility)}, @@ -67,7 +67,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 -@@ -1914,6 +1914,11 @@ +@@ -1919,6 +1919,11 @@ // with neural net palm detection. "expiry_milestone": 90 }, diff --git a/build/patches/Restore-Simplified-NTP-launch.patch b/build/patches/Restore-Simplified-NTP-launch.patch index 990ab880..32019b6a 100644 --- a/build/patches/Restore-Simplified-NTP-launch.patch +++ b/build/patches/Restore-Simplified-NTP-launch.patch @@ -229,7 +229,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageL initializeSearchBoxTextView(); initializeVoiceSearchButton(); initializeLayoutChangeListener(); -@@ -551,10 +555,16 @@ public class NewTabPageLayout extends LinearLayout implements TileGroup.Observer +@@ -549,10 +553,16 @@ public class NewTabPageLayout extends LinearLayout implements TileGroup.Observer * Updates the padding for the tile grid based on what is shown above it. */ private void updateTileGridPadding() { @@ -248,7 +248,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageL mSiteSectionViewHolder.itemView.setPadding( 0, paddingTop, 0, mSiteSectionViewHolder.itemView.getPaddingBottom()); } -@@ -887,6 +897,22 @@ public class NewTabPageLayout extends LinearLayout implements TileGroup.Observer +@@ -885,6 +895,22 @@ public class NewTabPageLayout extends LinearLayout implements TileGroup.Observer mSearchBoxCoordinator.destroy(); } @@ -319,7 +319,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/suggestions/Sug 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 -@@ -3542,6 +3542,9 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3548,6 +3548,9 @@ const FeatureEntry kFeatureEntries[] = { SINGLE_VALUE_TYPE_AND_VALUE( switches::kForceShowUpdateMenuItemCustomSummary, "Custom Summary")}, diff --git a/build/patches/Restore-enable-horizontal-tab-switcher-flag.patch b/build/patches/Restore-enable-horizontal-tab-switcher-flag.patch index 897d6125..3e0c21e1 100644 --- a/build/patches/Restore-enable-horizontal-tab-switcher-flag.patch +++ b/build/patches/Restore-enable-horizontal-tab-switcher-flag.patch @@ -9,7 +9,7 @@ Subject: Restore enable-horizontal-tab-switcher flag 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 -@@ -1666,7 +1666,7 @@ +@@ -1671,7 +1671,7 @@ { "name": "enable-horizontal-tab-switcher", "owners": [ "memex-team@google.com" ], 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 34d0153b..33c261e4 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 @@ -13,7 +13,7 @@ This reverts commit 4e598f38a0e6dd3dbede009c6a99b2a520a94e1f. 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 -@@ -3048,6 +3048,10 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3054,6 +3054,10 @@ const FeatureEntry kFeatureEntries[] = { SINGLE_VALUE_TYPE(switches::kHostedAppQuitNotification)}, #endif // OS_MAC #if defined(OS_ANDROID) @@ -27,7 +27,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 -@@ -900,6 +900,11 @@ +@@ -905,6 +905,11 @@ // enable-javascript-harmony. "expiry_milestone": -1 }, diff --git a/build/patches/Revert-the-removal-of-an-option-to-block-autoplay.patch b/build/patches/Revert-the-removal-of-an-option-to-block-autoplay.patch index 3b5d3b4e..a95a9e1e 100644 --- a/build/patches/Revert-the-removal-of-an-option-to-block-autoplay.patch +++ b/build/patches/Revert-the-removal-of-an-option-to-block-autoplay.patch @@ -524,7 +524,7 @@ diff --git a/components/content_settings/core/common/content_settings_mojom_trai + data.ReadAutoplayRules(&out->autoplay_rules) && data.ReadPopupRedirectRules(&out->popup_redirect_rules) && data.ReadMixedContentRules(&out->mixed_content_rules) && - data.ReadTimezoneOverrideRules(&out->timezone_override_rules) && + data.ReadTimezoneOverrideRules(&out->timezone_override_rules) && diff --git a/components/content_settings/core/common/content_settings_mojom_traits.h b/components/content_settings/core/common/content_settings_mojom_traits.h --- a/components/content_settings/core/common/content_settings_mojom_traits.h +++ b/components/content_settings/core/common/content_settings_mojom_traits.h diff --git a/build/patches/Update-i18n-zh_CN-support.patch b/build/patches/Update-i18n-zh_CN-support.patch index 471c6fa5..8c309ac8 100644 --- a/build/patches/Update-i18n-zh_CN-support.patch +++ b/build/patches/Update-i18n-zh_CN-support.patch @@ -85,5 +85,5 @@ diff --git a/components/strings/components_strings_zh-CN.xtb b/components/string +自动播放 + -- -2.29.2 +2.17.1 diff --git a/build/patches/Use-4-tile-rows-never-show-logo.patch b/build/patches/Use-4-tile-rows-never-show-logo.patch index ef0c1953..dfbb335d 100644 --- a/build/patches/Use-4-tile-rows-never-show-logo.patch +++ b/build/patches/Use-4-tile-rows-never-show-logo.patch @@ -22,7 +22,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageL private boolean mSearchProviderIsGoogle; private boolean mInitialized; -@@ -531,7 +531,7 @@ public class NewTabPageLayout extends LinearLayout implements TileGroup.Observer +@@ -529,7 +529,7 @@ public class NewTabPageLayout extends LinearLayout implements TileGroup.Observer && mInitialized) { return; } @@ -31,7 +31,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageL mSearchProviderIsGoogle = isGoogle; updateTileGridPadding(); -@@ -802,7 +802,7 @@ public class NewTabPageLayout extends LinearLayout implements TileGroup.Observer +@@ -800,7 +800,7 @@ public class NewTabPageLayout extends LinearLayout implements TileGroup.Observer Integer maxRows = mQueryTileSection == null ? null : mQueryTileSection.getMaxRowsForMostVisitedTiles(); diff --git a/build/patches/User-agent-customization.patch b/build/patches/User-agent-customization.patch index a315fbc0..f5726ba0 100644 --- a/build/patches/User-agent-customization.patch +++ b/build/patches/User-agent-customization.patch @@ -952,7 +952,7 @@ diff --git a/chrome/browser/android/tab_android.h b/chrome/browser/android/tab_a 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 -@@ -1236,6 +1236,13 @@ std::string GetUserAgent() { +@@ -1246,6 +1246,13 @@ std::string GetUserAgent() { blink::UserAgentMetadata GetUserAgentMetadata() { blink::UserAgentMetadata metadata; @@ -966,7 +966,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch metadata.brand_version_list = GetBrandVersionList(); metadata.full_version = version_info::GetVersionNumber(); metadata.platform = version_info::GetOSType(); -@@ -2310,6 +2317,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches( +@@ -2320,6 +2327,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches( blink::switches::kUserAgentClientHintDisable); }