Rebase to 140

This commit is contained in:
Carmelo Messina
2025-08-30 12:50:59 +02:00
parent 6d6ce62db9
commit 054870731c
210 changed files with 2359 additions and 2541 deletions
@@ -12,16 +12,16 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
diff --git a/chrome/version.gni b/chrome/version.gni
--- a/chrome/version.gni
+++ b/chrome/version.gni
@@ -80,7 +80,7 @@ if (target_os == "android") {
"trichrome_auto_64_version_code = \"@TRICHROME_AUTO_64_VERSION_CODE@\" "
@@ -79,7 +79,7 @@ if (target_os == "android") {
_version_dictionary_template +=
"trichrome_desktop_64_version_code = \"@TRICHROME_DESKTOP_64_VERSION_CODE@\" "
"trichrome_auto_64_version_code = \"@TRICHROME_AUTO_64_VERSION_CODE@\" "
_version_dictionary_template += "trichrome_desktop_64_version_code = \"@TRICHROME_DESKTOP_64_VERSION_CODE@\" "
- if (target_cpu == "arm64") {
+ if (target_cpu == "arm64" || target_cpu == "x64") {
_version_dictionary_template += "trichrome_64_32_high_version_code = \"@TRICHROME_64_32_HIGH_VERSION_CODE@\" "
_version_dictionary_template += "trichrome_auto_64_32_high_version_code = \"@TRICHROME_AUTO_64_32_HIGH_VERSION_CODE@\" "
}
@@ -188,7 +188,7 @@ if (is_mac) {
@@ -198,7 +198,7 @@ if (is_mac) {
chrome_version_name = chrome_version_full
# There is a different version code only for arm64.
@@ -33,7 +33,7 @@ diff --git a/chrome/version.gni b/chrome/version.gni
diff --git a/components/viz/common/features.cc b/components/viz/common/features.cc
--- a/components/viz/common/features.cc
+++ b/components/viz/common/features.cc
@@ -216,6 +216,7 @@ const base::FeatureParam<std::string> kWebViewADPFSocManufacturerBlocklist{
@@ -228,6 +228,7 @@ const base::FeatureParam<std::string> kWebViewADPFSocManufacturerBlocklist{
BASE_FEATURE(kWebViewEnableADPFRendererMain,
"WebViewEnableADPFRendererMain",
base::FEATURE_DISABLED_BY_DEFAULT);
@@ -41,7 +41,7 @@ diff --git a/components/viz/common/features.cc b/components/viz/common/features.
// If enabled, the GPU Main thread is included in the set of threads reported
// to the HWUI. This feature works only when WebViewEnableADPF is enabled,
@@ -325,6 +326,7 @@ BASE_FEATURE(kEnableInteractiveOnlyADPFRenderer,
@@ -328,6 +329,7 @@ BASE_FEATURE(kEnableInteractiveOnlyADPFRenderer,
// If enabled, Chrome includes the Compositor GPU Thread into the
// ADPF(Android Dynamic Performance Framework) hint session, instead
// of the GPU Main Thread.