Discharge7443/brave-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update patches from Chromium 112.0.5610.0 to Chromium 112.0.5615.12.

Browse Source
This commit is contained in:
Claudio DeSouza
2023-03-17 18:51:26 -04:00
committed by mkarolin
parent c4afcc043c
commit 26ea6434a9
69 changed files with 157 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files
patches/base-BUILD.gn.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/base/BUILD.gn b/base/BUILD.gn
index d8b947bb87bc9d3057dc78ae15c025dc166453f5..4e8d5c2b3422041b9996d9bfc92c639d5ba72517 100644
index 422702cb196c5fa05d089af2789e90360fe5b006..e33a395145afbd85b5e2e4e54b6595d275bd9a46 100644
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
@@ -4247,6 +4247,7 @@ if (is_android) {
@@ -4253,6 +4253,7 @@ if (is_android) {
"android/java/src/org/chromium/base/task/TaskTraits.java",
"android/java/src/org/chromium/base/task/TaskTraitsExtensionDescriptor.java",
]
patches/build-config-android-internal_rules.gni.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/build/config/android/internal_rules.gni b/build/config/android/internal_rules.gni
index ec03c6e3caf69c9851f13f7f2d09e6eece18fc1f..60ee4f12dc6ce0d63e4c590c72f4a3a9dc83f56c 100644
index ca98628bbd48b938b7190e6afcf1cb77db674e9b..42022668766d409b8ee5796f65e7fba6dcc8a1e8 100644
--- a/build/config/android/internal_rules.gni
+++ b/build/config/android/internal_rules.gni
@@ -3946,6 +3946,7 @@ if (enable_java_templates) {
@@ -3956,6 +3956,7 @@ if (enable_java_templates) {
} else {
not_needed(invoker, [ "missing_classes_allowlist" ])
}
patches/build-config-android-rules.gni.patch
+3 -3
View File
@@ -1,8 +1,8 @@
diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
index c17780dd5ade4cdedd4f037ead33997b5c311daf..c10669bee7559b2b2a46663c16a7b9ba8fcd181d 100644
index 753228613cf43a857621d934ba6f8bcca34e2eed..714967113d71e4bc729b6d8e531ab5b28cf90f90 100644
--- a/build/config/android/rules.gni
+++ b/build/config/android/rules.gni
@@ -580,6 +580,7 @@ if (enable_java_templates && is_android) {
@@ -577,6 +577,7 @@ if (enable_java_templates && is_android) {
# ]
# }
template("java_cpp_enum") {
@@ -10,7 +10,7 @@ index c17780dd5ade4cdedd4f037ead33997b5c311daf..c10669bee7559b2b2a46663c16a7b9ba
action_with_pydeps(target_name) {
forward_variables_from(invoker, TESTONLY_AND_VISIBILITY + [ "sources" ])
@@ -755,6 +756,7 @@ if (enable_java_templates && is_android) {
@@ -752,6 +753,7 @@ if (enable_java_templates && is_android) {
# output = "$target_gen_dir/AndroidManifest.xml"
# }
template("jinja_template") {
patches/chrome-BUILD.gn.patch
+12 -12
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
index a5fca773c0eead4f19a095f3dd32e46383c347c3..6df6257bf93163e7738d20484c8ebe1882b1cb16 100644
index 5d54960da4162953561903862f590fd0a5047ea2..f52b7d4c56b7cff93b4974f3c2c1e066ce7f85aa 100644
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -186,6 +186,7 @@ if (!is_android && !is_mac) {
@@ -10,7 +10,7 @@ index a5fca773c0eead4f19a095f3dd32e46383c347c3..6df6257bf93163e7738d20484c8ebe18
deps += [
":chrome_dll",
@@ -487,11 +488,12 @@ if (is_win) {
@@ -486,11 +487,12 @@ if (is_win) {
args += [ "--keystone=0" ]
}
}
@@ -24,7 +24,7 @@ index a5fca773c0eead4f19a095f3dd32e46383c347c3..6df6257bf93163e7738d20484c8ebe18
extra_substitutions = [
"CHROMIUM_BUNDLE_ID=$chrome_mac_bundle_id",
"CHROMIUM_SHORT_NAME=$chrome_product_short_name",
@@ -512,6 +514,7 @@ if (is_win) {
@@ -511,6 +513,7 @@ if (is_win) {
"//chrome/common:buildflags",
"//chrome/common:version_header",
]
@@ -32,7 +32,7 @@ index a5fca773c0eead4f19a095f3dd32e46383c347c3..6df6257bf93163e7738d20484c8ebe18
if (enable_stripping) {
# At link time, preserve the global symbols specified in the .exports
@@ -584,7 +587,7 @@ if (is_win) {
@@ -583,7 +586,7 @@ if (is_win) {
args =
[
"-b",
@@ -41,7 +41,7 @@ index a5fca773c0eead4f19a095f3dd32e46383c347c3..6df6257bf93163e7738d20484c8ebe18
"-v",
chrome_version_full,
"-g",
@@ -658,6 +661,7 @@ if (is_win) {
@@ -657,6 +660,7 @@ if (is_win) {
# this dependency directly copies the file into the framework's
# resources directory.
public_deps += [ ":chrome_framework_widevine_signature" ]
@@ -49,7 +49,7 @@ index a5fca773c0eead4f19a095f3dd32e46383c347c3..6df6257bf93163e7738d20484c8ebe18
}
}
@@ -699,9 +703,11 @@ if (is_win) {
@@ -698,9 +702,11 @@ if (is_win) {
"--scm=0",
]
}
@@ -61,7 +61,7 @@ index a5fca773c0eead4f19a095f3dd32e46383c347c3..6df6257bf93163e7738d20484c8ebe18
if (is_chrome_branded && include_branded_entitlements) {
# These entitlements are bound to the official Google Chrome signing
# certificate and will not necessarily work in any other build.
@@ -726,6 +732,7 @@ if (is_win) {
@@ -725,6 +731,7 @@ if (is_win) {
info_plist_target = invoker.info_plist_target
} else {
info_plist_target = ":chrome_helper_plist"
@@ -69,7 +69,7 @@ index a5fca773c0eead4f19a095f3dd32e46383c347c3..6df6257bf93163e7738d20484c8ebe18
}
extra_substitutions = [
@@ -904,6 +911,7 @@ if (is_win) {
@@ -903,6 +910,7 @@ if (is_win) {
sources += [ "//third_party/updater/chrome_mac_universal_prod/${updater_product_full_name}.app" ]
} else {
sources += [ "$root_out_dir/${updater_product_full_name}.app" ]
@@ -77,7 +77,7 @@ index a5fca773c0eead4f19a095f3dd32e46383c347c3..6df6257bf93163e7738d20484c8ebe18
public_deps += [
"//chrome/updater/mac:browser_install_script",
@@ -1213,6 +1221,7 @@ if (is_win) {
@@ -1212,6 +1220,7 @@ if (is_win) {
chrome_dylib_version,
"-Wl,-order_file," + rebase_path("app/framework.order", root_build_dir),
]
@@ -85,7 +85,7 @@ index a5fca773c0eead4f19a095f3dd32e46383c347c3..6df6257bf93163e7738d20484c8ebe18
if (!is_component_build) {
# Specify a sensible install_name for static builds. The library is
@@ -1393,6 +1402,7 @@ if (is_win) {
@@ -1392,6 +1401,7 @@ if (is_win) {
group("dependencies") {
public_deps = [
@@ -93,7 +93,7 @@ index a5fca773c0eead4f19a095f3dd32e46383c347c3..6df6257bf93163e7738d20484c8ebe18
"//build:branding_buildflags",
"//build:chromeos_buildflags",
"//chrome/browser",
@@ -1463,7 +1473,7 @@ group("dependencies") {
@@ -1462,7 +1472,7 @@ group("dependencies") {
if (is_win) {
process_version_rc_template("chrome_exe_version") {
@@ -102,7 +102,7 @@ index a5fca773c0eead4f19a095f3dd32e46383c347c3..6df6257bf93163e7738d20484c8ebe18
output = "$target_gen_dir/chrome_exe_version.rc"
}
@@ -1517,6 +1527,7 @@ group("resources") {
@@ -1516,6 +1526,7 @@ group("resources") {
"//chrome/browser:resources",
"//chrome/common:resources",
"//chrome/renderer:resources",
patches/chrome-android-BUILD.gn.patch
+11 -11
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
index d88c0937a85df2842858c18e5d7989d8f6fea64a..5cdc7b23e5f227a87eca9a62ff0deea29fd23976 100644
index c38a8877b043b1b5e468d1d7a7eb6c48ea17ab70..0d6f0d6661bfa84d38bf1068dcb203d6b7caed43 100644
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -107,6 +107,7 @@ if (current_toolchain == default_toolchain) {
@@ -108,6 +108,7 @@ if (current_toolchain == default_toolchain) {
"java/res_chromium_base/mipmap-xxxhdpi/layered_app_icon_background.png",
"java/res_chromium_base/values/channel_constants.xml",
]
@@ -10,7 +10,7 @@ index d88c0937a85df2842858c18e5d7989d8f6fea64a..5cdc7b23e5f227a87eca9a62ff0deea2
}
android_resources("chrome_app_java_resources") {
@@ -184,6 +185,7 @@ if (current_toolchain == default_toolchain) {
@@ -185,6 +186,7 @@ if (current_toolchain == default_toolchain) {
"//third_party/androidx:androidx_gridlayout_gridlayout_java",
"//third_party/androidx:androidx_preference_preference_java",
]
@@ -18,7 +18,7 @@ index d88c0937a85df2842858c18e5d7989d8f6fea64a..5cdc7b23e5f227a87eca9a62ff0deea2
}
if (enable_vr) {
@@ -583,6 +585,7 @@ if (current_toolchain == default_toolchain) {
@@ -584,6 +586,7 @@ if (current_toolchain == default_toolchain) {
]
deps += feed_deps
@@ -26,7 +26,7 @@ index d88c0937a85df2842858c18e5d7989d8f6fea64a..5cdc7b23e5f227a87eca9a62ff0deea2
srcjar_deps = [
":chrome_android_java_enums_srcjar",
@@ -606,6 +609,7 @@ if (current_toolchain == default_toolchain) {
@@ -607,6 +610,7 @@ if (current_toolchain == default_toolchain) {
"//components/offline_pages/core:offline_page_model_enums_java",
"//net:effective_connection_type_java",
]
@@ -34,7 +34,7 @@ index d88c0937a85df2842858c18e5d7989d8f6fea64a..5cdc7b23e5f227a87eca9a62ff0deea2
# From java_sources.gni.
sources = chrome_java_sources + [ app_hooks_impl ]
@@ -747,6 +751,7 @@ if (current_toolchain == default_toolchain) {
@@ -752,6 +756,7 @@ if (current_toolchain == default_toolchain) {
"//chrome/android/features/tab_ui:module_desc_java",
]
}
@@ -42,7 +42,7 @@ index d88c0937a85df2842858c18e5d7989d8f6fea64a..5cdc7b23e5f227a87eca9a62ff0deea2
}
action_with_pydeps("chrome_android_java_google_api_keys_srcjar") {
@@ -1970,6 +1975,7 @@ if (current_toolchain == default_toolchain) {
@@ -1977,6 +1982,7 @@ if (current_toolchain == default_toolchain) {
"java/res_chromium_base/mipmap-xxxhdpi/layered_app_icon_background.png",
"java/res_chromium_base/values/channel_constants.xml",
]
@@ -50,7 +50,7 @@ index d88c0937a85df2842858c18e5d7989d8f6fea64a..5cdc7b23e5f227a87eca9a62ff0deea2
# Dep needed to ensure override works properly.
deps = [ ":chrome_base_module_resources" ]
@@ -2230,6 +2236,7 @@ if (current_toolchain == default_toolchain) {
@@ -2237,6 +2243,7 @@ if (current_toolchain == default_toolchain) {
":${_variant}_locale_pak_assets",
":${_variant}_paks",
]
@@ -58,7 +58,7 @@ index d88c0937a85df2842858c18e5d7989d8f6fea64a..5cdc7b23e5f227a87eca9a62ff0deea2
if (_is_monochrome) {
deps += [ "//android_webview:locale_pak_assets" ]
if (webview_includes_weblayer && !_is_bundle_module) {
@@ -2422,6 +2429,7 @@ if (current_toolchain == default_toolchain) {
@@ -2429,6 +2436,7 @@ if (current_toolchain == default_toolchain) {
shared_libraries = [ ":libchrome" ]
version_name = chrome_version_name
@@ -66,7 +66,7 @@ index d88c0937a85df2842858c18e5d7989d8f6fea64a..5cdc7b23e5f227a87eca9a62ff0deea2
}
}
@@ -2557,6 +2565,7 @@ if (current_toolchain == default_toolchain) {
@@ -2564,6 +2572,7 @@ if (current_toolchain == default_toolchain) {
"//components/payments/content/android:service_java",
"//third_party/androidx:androidx_browser_browser_java",
]
@@ -74,7 +74,7 @@ index d88c0937a85df2842858c18e5d7989d8f6fea64a..5cdc7b23e5f227a87eca9a62ff0deea2
# More deps for DFMs.
if (dfmify_dev_ui) {
@@ -2651,6 +2660,7 @@ if (current_toolchain == default_toolchain) {
@@ -2658,6 +2667,7 @@ if (current_toolchain == default_toolchain) {
deps += [ "//weblayer/browser/java:upstream_java" ]
}
}
patches/chrome-android-chrome_public_apk_tmpl.gni.patch
+3 -3
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/android/chrome_public_apk_tmpl.gni b/chrome/android/chrome_public_apk_tmpl.gni
index b4f02b72bd03e0dc4f965f6ab86d8a667965213f..a597d7aebe90130e3a1fd58c2cc4f3647816a8b1 100644
index 56949f4bb7496f40204bfc72f74123104f5ea1ff..80e4ee752d22241a0b45dfd867d3ca0a1762135c 100644
--- a/chrome/android/chrome_public_apk_tmpl.gni
+++ b/chrome/android/chrome_public_apk_tmpl.gni
@@ -270,6 +270,7 @@ template("chrome_public_common_apk_or_module_tmpl") {
@@ -281,6 +281,7 @@ template("chrome_public_common_apk_or_module_tmpl") {
"*ic_file_download_white*", # Bottom edge seems misaligned.
"*ic_lock.*", # Bottom edge seems misaligned.
]
@@ -10,7 +10,7 @@ index b4f02b72bd03e0dc4f965f6ab86d8a667965213f..a597d7aebe90130e3a1fd58c2cc4f364
# Note most of these, with the exception of resource_exclusion_exceptions,
# are currently duplicated in system_webview_apk_tmpl.gni.
@@ -375,6 +376,7 @@ template("chrome_public_common_apk_or_module_tmpl") {
@@ -386,6 +387,7 @@ template("chrome_public_common_apk_or_module_tmpl") {
proguard_configs = []
}
proguard_configs += [ "//chrome/android/proguard/main.flags" ]
patches/chrome-android-java-AndroidManifest.xml.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
index 8db7d5241fef7d222576603be717f137401654b8..ccd7b5ef50e5078860c8d151e15b22d4edcdae7a 100644
index 6124a0bc18edf26648bfcdcf257160dca8ac1e77..d10f56b1c902d8c1533430cc863691e1c0f6e666 100644
--- a/chrome/android/java/AndroidManifest.xml
+++ b/chrome/android/java/AndroidManifest.xml
@@ -28,6 +28,7 @@ by a child template that "extends" this file.
patches/chrome-app-BUILD.gn.patch
+3 -3
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/app/BUILD.gn b/chrome/app/BUILD.gn
index 2b3ce76e61bd910b72371657c0064cb218cb2343..7be8b937b55cad401745b68e118679eed7a94444 100644
index 72b2e13673ac5f61ebcff96834a86b39ebaa8eda..1f87b74c343e52c7f4e8a6686dca3a9f85a0cac9 100644
--- a/chrome/app/BUILD.gn
+++ b/chrome/app/BUILD.gn
@@ -110,6 +110,8 @@ grit("generated_resources") {
@@ -124,6 +124,8 @@ grit("generated_resources") {
if (is_android) {
outputs += android_generated_java_resources
}
@@ -11,7 +11,7 @@ index 2b3ce76e61bd910b72371657c0064cb218cb2343..7be8b937b55cad401745b68e118679ee
}
if (is_android) {
@@ -145,7 +147,7 @@ grit("google_chrome_strings") {
@@ -159,7 +161,7 @@ grit("google_chrome_strings") {
}
grit("chromium_strings") {
patches/chrome-browser-BUILD.gn.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index 5b9130cb4c8c77782b701205a153c9e926eadc72..e3d8d6ac346df2a83e9610a3760cf6f63249c705 100644
index b91b69e736d35522f2d1777ed270ab072c2c8ac3..306c78c7ec667bd2d59eb42576424c5e1532df56 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -2540,6 +2540,7 @@ static_library("browser") {
@@ -2547,6 +2547,7 @@ static_library("browser") {
"performance_monitor/metric_evaluator_helper_posix.h",
]
}
patches/chrome-browser-about_flags.cc.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 2e07c1a94ec910d2b0fc69f60559d12d7e6a1346..4fbeee2603c8a1f0b1b99afdbbd19be3fbf3b075 100644
index dbf6ee125a9a72f3f1916a7d96cc902fb4dd684c..f7fbeb735d446941257ccb422e398bd72adcc42f 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -3229,6 +3229,7 @@ const FeatureEntry::FeatureVariation kPrivacySandboxSettings4Variations[] = {
@@ -3209,6 +3209,7 @@ const FeatureEntry::FeatureVariation kPrivacySandboxSettings4Variations[] = {
//
// When adding a new choice, add it to the end of the list.
const FeatureEntry kFeatureEntries[] = {
patches/chrome-browser-extensions-BUILD.gn.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUILD.gn
index a49bd4a5da442a57aa6cd9b793e46c4395c42eaa..720b55c13960ed8c982a41d299f5624f5cac65d6 100644
index c5b695f2699fd650ec2305be4f281ca72ca2b6fb..c40419802ac5687f8e1e3f926d0b425873f6e3de 100644
--- a/chrome/browser/extensions/BUILD.gn
+++ b/chrome/browser/extensions/BUILD.gn
@@ -1379,6 +1379,7 @@ static_library("extensions") {
@@ -1385,6 +1385,7 @@ static_library("extensions") {
} else {
sources += [ "api/braille_display_private/braille_controller_stub.cc" ]
}
patches/chrome-browser-extensions-api-identity-identity_get_auth_token_function.cc.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/extensions/api/identity/identity_get_auth_token_function.cc b/chrome/browser/extensions/api/identity/identity_get_auth_token_function.cc
index 04a1506295005bed19a905232b07f87fba858c13..1b9870c3cfe4275ae24e84fa753bc89f567568af 100644
index 120ed70af8385cda741cd1f34d21751c0873d0fd..6cfe5c04ac03735f235b3f3dd931a4663936999c 100644
--- a/chrome/browser/extensions/api/identity/identity_get_auth_token_function.cc
+++ b/chrome/browser/extensions/api/identity/identity_get_auth_token_function.cc
@@ -48,6 +48,13 @@
patches/chrome-browser-extensions-extension_tab_util.cc.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/extensions/extension_tab_util.cc b/chrome/browser/extensions/extension_tab_util.cc
index 3de7770e350ee6bfe99fb5c6b8e74fc5f60fed1b..90d37faacc153cbb18e8085a797047d4b242ef8b 100644
index c8c47f57ebed6498beeb93c89ee2eeaade2659d0..963c3b26a383ff4f5ba593081f5e2b5a44dcb127 100644
--- a/chrome/browser/extensions/extension_tab_util.cc
+++ b/chrome/browser/extensions/extension_tab_util.cc
@@ -768,6 +768,7 @@ bool ExtensionTabUtil::IsKillURL(const GURL& url) {
@@ -770,6 +770,7 @@ bool ExtensionTabUtil::IsKillURL(const GURL& url) {
};
if (!url.SchemeIs(content::kChromeUIScheme))
patches/chrome-browser-media-webrtc-webrtc_log_uploader.cc.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/media/webrtc/webrtc_log_uploader.cc b/chrome/browser/media/webrtc/webrtc_log_uploader.cc
index f964d5bc9eb40a647eac929b8879e6a96f5613ae..d687cc065e1d171cd67d4f1ea3193b1532fb6d94 100644
index 7eb962e47c00c7e988cac4336b9b238a66e24c37..0cb7ff95046f2a422e5871a572868e18ce43c553 100644
--- a/chrome/browser/media/webrtc/webrtc_log_uploader.cc
+++ b/chrome/browser/media/webrtc/webrtc_log_uploader.cc
@@ -446,6 +446,7 @@ std::string WebRtcLogUploader::CompressLog(WebRtcLogBuffer* buffer) {
@@ -447,6 +447,7 @@ std::string WebRtcLogUploader::CompressLog(WebRtcLogBuffer* buffer) {
void WebRtcLogUploader::UploadCompressedLog(
WebRtcLogUploader::UploadDoneData upload_done_data,
std::unique_ptr<std::string> post_data) {
patches/chrome-browser-prefs-browser_prefs.cc.patch
+3 -3
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 5ff05c4e91742735392b360544e4d3680eaff540..371983cde00cbcb139310469c21dc03d6eaf7659 100644
index ff57c231cc784ca51cfb395d2a1d5c74415bbc1b..5bbf1f0fbaa4c28c9b0bbf2c518ce12beeb0ad13 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -1271,6 +1271,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
@@ -1295,6 +1295,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
DeviceOAuth2TokenStoreDesktop::RegisterPrefs(registry);
#endif
@@ -11,7 +11,7 @@ index 5ff05c4e91742735392b360544e4d3680eaff540..371983cde00cbcb139310469c21dc03d
#if BUILDFLAG(ENABLE_SCREEN_AI_SERVICE)
screen_ai::RegisterLocalStatePrefs(registry);
#endif // BUILDFLAG(ENABLE_SCREEN_AI_SERVICE)
@@ -1673,6 +1675,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
@@ -1694,6 +1696,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
#if BUILDFLAG(IS_ANDROID)
registry->RegisterBooleanPref(prefs::kQuickDeleteDialogSuppressed, false);
#endif
patches/chrome-browser-renderer_context_menu-render_view_context_menu.cc.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu.cc b/chrome/browser/renderer_context_menu/render_view_context_menu.cc
index 798c429ac5c09d8667a2075c00ae4cfd25d68d6e..ea4b8ed06ac8be3d568ae6cb5f3fe85e6f24ee7e 100644
index e0d7724c3a34170213daa7a3fe5d73774cc18349..ab9cd5eef84c36892de4ecb743d16e0810b48784 100644
--- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc
+++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc
@@ -1994,6 +1994,7 @@ void RenderViewContextMenu::AppendSearchProvider() {
@@ -2006,6 +2006,7 @@ void RenderViewContextMenu::AppendSearchProvider() {
selection_navigation_url_ = match.destination_url;
if (!selection_navigation_url_.is_valid())
return;
patches/chrome-browser-resources-bookmarks-command_manager.ts.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/resources/bookmarks/command_manager.ts b/chrome/browser/resources/bookmarks/command_manager.ts
index bf9f0355d80d61e0128c488abbff157d0be6369f..37b60fc4a77b023b270b60f7c8b9b7aec502f6a2 100644
index bf9f0355d80d61e0128c488abbff157d0be6369f..0c153f5e74ab2a1a660348444a6f23fae18800d0 100644
--- a/chrome/browser/resources/bookmarks/command_manager.ts
+++ b/chrome/browser/resources/bookmarks/command_manager.ts
@@ -433,7 +433,7 @@ export class BookmarksCommandManagerElement extends
patches/chrome-browser-resources-settings-BUILD.gn.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/resources/settings/BUILD.gn b/chrome/browser/resources/settings/BUILD.gn
index 9a60bf8a7acf66728ef166e144c6be4f4428865b..ac50e01ca42475061fbd9cd02e40e3678dd26960 100644
index ec72da2b743fc5d279fd6d3a548a233dd4fd1e1f..a9c05a25be274835c5aff830c421fdb69697ecc8 100644
--- a/chrome/browser/resources/settings/BUILD.gn
+++ b/chrome/browser/resources/settings/BUILD.gn
@@ -449,4 +449,5 @@ build_webui("build") {
@@ -450,4 +450,5 @@ build_webui("build") {
optimize_webui_excludes =
[ "chrome://resources/mojo/skia/public/mojom/skcolor.mojom-webui.js" ]
}
patches/chrome-browser-resources-settings-privacy_page-privacy_page.html.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.html b/chrome/browser/resources/settings/privacy_page/privacy_page.html
index 35759121ebc159cf8cfe95623d4997db0e0c0b2a..c157b86e9e517c897034bdb8c73ecec971502588 100644
index e5e5e60c2b8c4346ed2600c973d6bd92124654f9..ed7fe35360c40c0ac559bccd96707214a46662bf 100644
--- a/chrome/browser/resources/settings/privacy_page/privacy_page.html
+++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html
@@ -34,6 +34,7 @@
patches/chrome-browser-resources-settings-privacy_page-privacy_page.ts.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.ts b/chrome/browser/resources/settings/privacy_page/privacy_page.ts
index 178ceed73f3289146d4d6efb7754aa2e9fb9e016..2e5451aa60821e5c8955cde5cc21a1e09c185d0e 100644
index dba4d3ad61cf82a1d18f258721927f531fb69885..5fbfea7fdffb50eadeb945c9fe2ff4d4f22871a8 100644
--- a/chrome/browser/resources/settings/privacy_page/privacy_page.ts
+++ b/chrome/browser/resources/settings/privacy_page/privacy_page.ts
@@ -18,6 +18,7 @@ import '../settings_page/settings_animated_pages.js';
patches/chrome-browser-resources-settings-route.ts.patch
+2 -2
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/resources/settings/route.ts b/chrome/browser/resources/settings/route.ts
index c8d4f532c755908d483fed3fa4242e21d72a13bb..05652b7843f0d532fd46a480b5c67e2dcdd4e954 100644
index 9deb1bd7fc3c16a87ad074fcfe2e2ecf20a162ce..ea56490a642823d76d0027a935c1f73b874e634a 100644
--- a/chrome/browser/resources/settings/route.ts
+++ b/chrome/browser/resources/settings/route.ts
@@ -8,6 +8,7 @@ import {loadTimeData} from 'chrome://resources/js/load_time_data.js';
@@ -10,7 +10,7 @@ index c8d4f532c755908d483fed3fa4242e21d72a13bb..05652b7843f0d532fd46a480b5c67e2d
/**
* Add all of the child routes that originate from the privacy route,
* regardless of whether the privacy section under basic or advanced.
@@ -260,6 +261,7 @@ function createBrowserSettingsRoutes(): SettingsRoutes {
@@ -263,6 +264,7 @@ function createBrowserSettingsRoutes(): SettingsRoutes {
loadTimeData.getString('performancePageTitle'));
}
}
patches/chrome-browser-resources-settings-router.ts.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/resources/settings/router.ts b/chrome/browser/resources/settings/router.ts
index 5810e8fb2ab399a222ec79c0df7fce9731e23e80..aea6f92bb2bc7813e05678f9775e78d4ba5fdced 100644
index a1b6fb80caad1d2f818b0575b6751866ce21abab..4210508aaa55e21c5ec0d080c5e7f259e654d69f 100644
--- a/chrome/browser/resources/settings/router.ts
+++ b/chrome/browser/resources/settings/router.ts
@@ -99,6 +99,7 @@ export interface SettingsRoutes {
@@ -100,6 +100,7 @@ export interface SettingsRoutes {
SYNC_ADVANCED: Route;
SYSTEM: Route;
TRIGGERED_RESET_DIALOG: Route;
patches/chrome-browser-resources-settings-site_settings-constants.ts.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/resources/settings/site_settings/constants.ts b/chrome/browser/resources/settings/site_settings/constants.ts
index 3e33bc32e4415928725e79305866b6e80eaa454b..4792f21c054180f80c0baa1bd9dda626fd9827af 100644
index 0addb22f963afa69c5dcc7732ce238bc086e1f7b..f99b6fc6e36c9bde82b9c5459e882ca2d5ca2dce 100644
--- a/chrome/browser/resources/settings/site_settings/constants.ts
+++ b/chrome/browser/resources/settings/site_settings/constants.ts
@@ -50,6 +50,7 @@ export enum ContentSettingsTypes {
@@ -51,6 +51,7 @@ export enum ContentSettingsTypes {
// are used everywhere where ContentSettingsTypes is used in JS.
PDF_DOCUMENTS = 'pdfDocuments',
SITE_DATA = 'site-data',
patches/chrome-browser-resources-settings-site_settings_page-site_settings_page.ts.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts b/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts
index c8132ad46a7ae16a487d7a63177f6212032ee4ef..a72306bbb13607bd4abfdaa82ed9de1c01ed2883 100644
index d455f6e7ae33d575b5af6b574b14023c4e7fcf5f..1323e9013b6fbfd27a1252ffac0f23f27df94d4b 100644
--- a/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts
+++ b/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts
@@ -8,6 +8,7 @@
patches/chrome-browser-spellchecker-spellcheck_hunspell_dictionary.cc.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc b/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc
index 27f5a789f39c3ac896e3d4b8fd9fedcb562ef8c4..5e67b557e4e0aaba50f1b18f430c32dda3d04ca5 100644
index 8302d03e58eede9376d399eaf5f5de166bea9b20..84b971116b01aba68256c1403bb5beee6312006f 100644
--- a/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc
+++ b/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc
@@ -277,7 +277,7 @@ GURL SpellcheckHunspellDictionary::GetDictionaryURL() {
@@ -274,7 +274,7 @@ GURL SpellcheckHunspellDictionary::GetDictionaryURL() {
DCHECK(!bdict_file.empty());
static const char kDownloadServerUrl[] =
patches/chrome-browser-ui-BUILD.gn.patch
+3 -3
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
index 87907de7fd7f489bc0ac3cedd438b129fb8e32be..5f78050300f9436c43b332501429288e2935d866 100644
index 94f900fb2e05e3a83c895af415962b3c3449e818..02daf5124946ed73d2134dfbe0aa95d56e79703e 100644
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -670,6 +670,7 @@ static_library("ui") {
@@ -671,6 +671,7 @@ static_library("ui") {
"//ui/webui",
"//v8:v8_version",
]
@@ -10,7 +10,7 @@ index 87907de7fd7f489bc0ac3cedd438b129fb8e32be..5f78050300f9436c43b332501429288e
# TODO(crbug/925153): Remove this circular dependency.
allow_circular_includes_from = [
@@ -4082,10 +4083,13 @@ static_library("ui") {
@@ -4085,10 +4086,13 @@ static_library("ui") {
]
deps += [ "//google_update" ]
} else {
patches/chrome-browser-ui-android-toolbar-BUILD.gn.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/ui/android/toolbar/BUILD.gn b/chrome/browser/ui/android/toolbar/BUILD.gn
index 58425e63699b3d16cc2eee6d52f859300ba6b308..5e6a4a648830e5254b591a7e6215f9432c7a961c 100644
index 9a3ee5650101af465f6479c3cbb17830e5b3525c..996652fa01a7061adec3ca01b025d79a4fc0c7e5 100644
--- a/chrome/browser/ui/android/toolbar/BUILD.gn
+++ b/chrome/browser/ui/android/toolbar/BUILD.gn
@@ -114,6 +114,7 @@ android_library("java") {
@@ -115,6 +115,7 @@ android_library("java") {
"java/src/org/chromium/chrome/browser/toolbar/top/ViewShiftingActionBarDelegate.java",
"java/src/org/chromium/chrome/browser/toolbar/top/VisibleUrlText.java",
]
patches/chrome-browser-ui-android-toolbar-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarPhone.java.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java
index 1ca9fbbe7b211789a037cbf4192da0733a0da78c..bbd0e9c4c328b57cb6eb9b226430b68fe1cfc1a4 100644
index f2a42285d5c5f2650030ce1e10c75160d991b4a2..80da54c7e40603c49ae7199c5e58b369a2b5b317 100644
--- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java
+++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java
@@ -392,6 +392,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC
patches/chrome-browser-ui-android-toolbar-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarTablet.java.patch
+3 -3
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarTablet.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarTablet.java
index 89d292d9e4c5cd9626492aef625b2a1f3812c8ca..a14d254615d505db0a95c2845d7c3330072194b8 100644
index e9133168973746836d6d618cc06f73aa602e953f..846fecdebb442d8b364f8b0a0e7439f5be097318 100644
--- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarTablet.java
+++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarTablet.java
@@ -362,10 +362,12 @@ public class ToolbarTablet
@@ -369,10 +369,12 @@ public class ToolbarTablet
mOfflineDownloader.downloadPage(getContext(), getToolbarDataProvider().getTab());
RecordUserAction.record("MobileToolbarDownloadPage");
}
@@ -15,7 +15,7 @@ index 89d292d9e4c5cd9626492aef625b2a1f3812c8ca..a14d254615d505db0a95c2845d7c3330
String description = null;
Context context = getContext();
Resources resources = context.getResources();
@@ -427,6 +429,7 @@ public class ToolbarTablet
@@ -478,6 +480,7 @@ public class ToolbarTablet
mLocationBar.getTabletCoordinator().tintBackground(textBoxColor);
mLocationBar.updateVisualsForState();
setToolbarHairlineColor(color);
patches/chrome-browser-ui-browser.cc.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index f800d1439fd03555fa0f987d83060ddc19b97907..115424ab4bd66bdf49cdf993a54046fb89b8d4fb 100644
index 8e86697ca27eca507e5a95acbc3d68656532e59a..c0a8ed616cb681ab6f4ac88196fdb0cd080cf8f9 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -450,6 +450,7 @@ Browser* Browser::Create(const CreateParams& params) {
patches/chrome-browser-ui-browser_ui_prefs.cc.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_ui_prefs.cc
index 37aaf66c885da48b47d993513f81d2313bcf33c5..a1f47f61436bd35af8c218a5ab2d98f139e60573 100644
index d73b89e65dc4fa5fab115d245e23c8e1f7568fa1..cfdf1c548cc1ce2a4d09a8dc67abd0d07a9c6f50 100644
--- a/chrome/browser/ui/browser_ui_prefs.cc
+++ b/chrome/browser/ui/browser_ui_prefs.cc
@@ -75,7 +75,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
patches/chrome-browser-ui-views-location_bar-location_bar_view.cc.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc
index 748416c66032bdbd2939da7ddf1e00d36280f1ed..be42d08d2bc65c8c1bd8edb752e206c0b93a0318 100644
index d549d8338e5305833c8962a78bfc668acf7355d0..b800314e534a52301372cec189281b9dd9f74616 100644
--- a/chrome/browser/ui/views/location_bar/location_bar_view.cc
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc
@@ -665,6 +665,7 @@ void LocationBarView::Layout() {
@@ -667,6 +667,7 @@ void LocationBarView::Layout() {
}
};
patches/chrome-browser-ui-views-page_info-page_info_main_view.cc.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/ui/views/page_info/page_info_main_view.cc b/chrome/browser/ui/views/page_info/page_info_main_view.cc
index b2940cf505d189cec114df4ca77c9d89920794dd..fbf05a22f5a25bed1894f15def27e162c812b3b3 100644
index b833d28bba07d02a4ba82651c47c163d61934663..d325e12b756a07adbd64431e3b6e9c8993e02c38 100644
--- a/chrome/browser/ui/views/page_info/page_info_main_view.cc
+++ b/chrome/browser/ui/views/page_info/page_info_main_view.cc
@@ -535,6 +535,7 @@ gfx::Size PageInfoMainView::CalculatePreferredSize() const {
patches/chrome-browser-ui-views-page_info-page_info_view_factory.cc.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/ui/views/page_info/page_info_view_factory.cc b/chrome/browser/ui/views/page_info/page_info_view_factory.cc
index 7a240248bb066206c53f1e8acc06a6e9f82d27ae..0ce5fb21b6e7e33f7c4894c727ec471ff7d833dd 100644
index eed0d6fc6fa89306935f2a6caa4e1f78d71829ef..67286f35507d8d60ef83c5e47aee1cb045a0ef21 100644
--- a/chrome/browser/ui/views/page_info/page_info_view_factory.cc
+++ b/chrome/browser/ui/views/page_info/page_info_view_factory.cc
@@ -251,6 +251,7 @@ const ui::ImageModel PageInfoViewFactory::GetPermissionIcon(
@@ -253,6 +253,7 @@ const ui::ImageModel PageInfoViewFactory::GetPermissionIcon(
const PageInfo::PermissionInfo& info) {
const gfx::VectorIcon* icon = &gfx::kNoneIcon;
switch (info.type) {
patches/chrome-browser-ui-views-side_panel-side_panel_coordinator.cc.patch
+3 -3
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/ui/views/side_panel/side_panel_coordinator.cc b/chrome/browser/ui/views/side_panel/side_panel_coordinator.cc
index 1a5ef427f1510607c804eff0ac4c2f49264ea99d..a3ab0525c0dfbf590bc78ae37c3960748f59e87d 100644
index bcb7e72af59d7c19ef9508776216f75e24e36e27..1c4891e9bf96e6daaaf1947f1e98729412a7048c 100644
--- a/chrome/browser/ui/views/side_panel/side_panel_coordinator.cc
+++ b/chrome/browser/ui/views/side_panel/side_panel_coordinator.cc
@@ -197,6 +197,7 @@ SidePanelRegistry* SidePanelCoordinator::GetGlobalSidePanelRegistry(
@@ -193,6 +193,7 @@ SidePanelRegistry* SidePanelCoordinator::GetGlobalSidePanelRegistry(
void SidePanelCoordinator::Show(
absl::optional<SidePanelEntry::Id> entry_id,
absl::optional<SidePanelUtil::SidePanelOpenTrigger> open_trigger) {
@@ -10,7 +10,7 @@ index 1a5ef427f1510607c804eff0ac4c2f49264ea99d..a3ab0525c0dfbf590bc78ae37c396074
if (entry_id.has_value()) {
Show(SidePanelEntry::Key(entry_id.value()), open_trigger);
} else {
@@ -580,6 +581,7 @@ std::unique_ptr<views::View> SidePanelCoordinator::CreateHeader() {
@@ -576,6 +577,7 @@ std::unique_ptr<views::View> SidePanelCoordinator::CreateHeader() {
ChromeDistanceMetric::DISTANCE_SIDE_PANEL_HEADER_VECTOR_ICON_SIZE)));
header_close_button->SetFocusBehavior(views::View::FocusBehavior::ALWAYS);
patches/chrome-browser-ui-webui-history-history_ui.cc.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/ui/webui/history/history_ui.cc b/chrome/browser/ui/webui/history/history_ui.cc
index 53aa116b703f4ecf0818e82d3f6aee1fc18fb38d..d1d97440f216adef010b8f41902c363e52aa3009 100644
index 3410fa07f266f5a1649f1142cba1a0b46090f307..b142509cb0fe0423b0a9fb84157f6f93cd548757 100644
--- a/chrome/browser/ui/webui/history/history_ui.cc
+++ b/chrome/browser/ui/webui/history/history_ui.cc
@@ -64,6 +64,7 @@ content::WebUIDataSource* CreateAndAddHistoryUIHTMLSource(Profile* profile) {
@@ -68,6 +68,7 @@ content::WebUIDataSource* CreateAndAddHistoryUIHTMLSource(Profile* profile) {
content::WebUIDataSource* source = content::WebUIDataSource::CreateAndAdd(
profile, chrome::kChromeUIHistoryHost);
patches/chrome-browser-ui-webui-settings-people_handler.cc.patch
+4 -4
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/ui/webui/settings/people_handler.cc b/chrome/browser/ui/webui/settings/people_handler.cc
index a17cfdab2751d07f705a3695ef9a191631351f89..3fd95993669aa912053399e459395def9eb2dac3 100644
index 2d2597b210c6e6534f4052f97a90f4bc777b0f21..08c19e4d962c7d44f80856cd9cc22b30d70c51bd 100644
--- a/chrome/browser/ui/webui/settings/people_handler.cc
+++ b/chrome/browser/ui/webui/settings/people_handler.cc
@@ -896,6 +896,7 @@ void PeopleHandler::OnStateChanged(syncer::SyncService* sync_service) {
@@ -888,6 +888,7 @@ void PeopleHandler::OnStateChanged(syncer::SyncService* sync_service) {
void PeopleHandler::BeforeUnloadDialogCancelled() {
// The before unload dialog is only shown during the first sync setup.
@@ -10,7 +10,7 @@ index a17cfdab2751d07f705a3695ef9a191631351f89..3fd95993669aa912053399e459395def
DCHECK(IdentityManagerFactory::GetForProfile(profile_)->HasPrimaryAccount(
signin::ConsentLevel::kSync));
syncer::SyncService* service = GetSyncService();
@@ -950,6 +951,7 @@ base::Value::Dict PeopleHandler::GetSyncStatusDictionary() const {
@@ -942,6 +943,7 @@ base::Value::Dict PeopleHandler::GetSyncStatusDictionary() const {
service && !disallowed_by_policy && service->IsSetupInProgress() &&
!service->GetUserSettings()->IsFirstSetupComplete() &&
identity_manager->HasPrimaryAccount(signin::ConsentLevel::kSync));
@@ -18,7 +18,7 @@ index a17cfdab2751d07f705a3695ef9a191631351f89..3fd95993669aa912053399e459395def
const SyncStatusLabels status_labels = GetSyncStatusLabels(profile_);
// TODO(crbug.com/1027467): Consider unifying some of the fields below to
@@ -1112,6 +1114,7 @@ void PeopleHandler::MaybeMarkSyncConfiguring() {
@@ -1104,6 +1106,7 @@ void PeopleHandler::MaybeMarkSyncConfiguring() {
}
bool PeopleHandler::IsProfileAuthNeededOrHasErrors() {
patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
index 8b8541767c8324afca318daf5690b67625f4f282..95b7e715844a5a704e6d24da43784b571993cb7c 100644
index d4fd703b122d08725c751d8c135b6712e34528cc..3fcc7e41762e5a18828ca7e3eaae2a0e27079af7 100644
--- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
+++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
@@ -3597,6 +3597,7 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source,
@@ -3610,6 +3610,7 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source,
policy_indicator::AddLocalizedStrings(html_source);
AddSecurityKeysStrings(html_source);
patches/chrome-browser-ui-webui-settings-site_settings_helper.cc.patch
+3 -3
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/ui/webui/settings/site_settings_helper.cc b/chrome/browser/ui/webui/settings/site_settings_helper.cc
index dda688f501c764d409aae37b02f0231035bc495f..33bd891880ba76b9ac632b61815c2ce909c53910 100644
index a51f51e4914fd2b5bb47b65d9c0bcdd76f89537c..b4a8478a6ee53349096de7d52f87966c3e7b16e5 100644
--- a/chrome/browser/ui/webui/settings/site_settings_helper.cc
+++ b/chrome/browser/ui/webui/settings/site_settings_helper.cc
@@ -183,6 +183,7 @@ const ContentSettingsTypeNameEntry kContentSettingsTypeGroupNames[] = {
@@ -184,6 +184,7 @@ const ContentSettingsTypeNameEntry kContentSettingsTypeGroupNames[] = {
{ContentSettingsType::FEDERATED_IDENTITY_AUTO_REAUTHN_PERMISSION, nullptr},
{ContentSettingsType::FEDERATED_IDENTITY_IDENTITY_PROVIDER_REGISTRATION,
nullptr},
@@ -10,7 +10,7 @@ index dda688f501c764d409aae37b02f0231035bc495f..33bd891880ba76b9ac632b61815c2ce9
};
static_assert(std::size(kContentSettingsTypeGroupNames) ==
@@ -371,6 +372,7 @@ bool HasRegisteredGroupName(ContentSettingsType type) {
@@ -372,6 +373,7 @@ bool HasRegisteredGroupName(ContentSettingsType type) {
}
ContentSettingsType ContentSettingsTypeFromGroupName(base::StringPiece name) {
patches/chrome-common-BUILD.gn.patch
+2 -2
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn
index 23d38248f8c9c490be1101f17657ab3cb6e64a63..a5902b53fa2df9c23887b96b672393e70e384ee7 100644
index f21f98e89fb254dc9d7865365ece3f50da5ef585..afaa9e2f0cb761334b105a9f9411ba150aa33737 100644
--- a/chrome/common/BUILD.gn
+++ b/chrome/common/BUILD.gn
@@ -89,6 +89,7 @@ source_set("channel_info") {
@@ -10,7 +10,7 @@ index 23d38248f8c9c490be1101f17657ab3cb6e64a63..a5902b53fa2df9c23887b96b672393e7
}
source_set("ini_parser") {
@@ -536,6 +537,7 @@ static_library("non_code_constants") {
@@ -537,6 +538,7 @@ static_library("non_code_constants") {
"//printing/buildflags",
"//ui/base:buildflags",
]
patches/chrome-test-BUILD.gn.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index 839e07a5df84cce51c548b7fb6a4446dfcaf1ad8..4b79a6213f8fb756722853bf6ce2195f7788dd60 100644
index faa7b52a0ffa0df0461ea2cdfa3b0e888a571a82..83757a70d2bff971949cbb17dae5826b25cf2420 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -391,6 +391,7 @@ static_library("test_support") {
@@ -392,6 +392,7 @@ static_library("test_support") {
"//ui/gl",
]
patches/components-browser_ui-site_settings-android-java-src-org-chromium-components-browser_ui-site_settings-SingleCategorySettings.java.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java
index 61c7a51acd3e6f581ee2519006a2d2c80a72a41b..88dfcffc11894625230c42c904af045e08b772d9 100644
index a8c06c4ffe12e88b3accfb98e8fd722569050a18..06aacb2541c332d78c305fe7e6a24e1212145613 100644
--- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java
+++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java
@@ -503,7 +503,7 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
@@ -510,7 +510,7 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
if (queryHasChanged) getInfoForOrigins();
return true;
}
patches/components-metrics-BUILD.gn.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/components/metrics/BUILD.gn b/components/metrics/BUILD.gn
index 4dac8140ddd1fd4b866e5507ac5be408248a7496..ed390fa86240fb2072d7e6e35ce85c7aa62774de 100644
index d787d25a8613c8360c8a9eecbbacdaced393b783..23830d5db2b3a2ce10a4b6576ce85801919701cb 100644
--- a/components/metrics/BUILD.gn
+++ b/components/metrics/BUILD.gn
@@ -254,6 +254,7 @@ static_library("metrics") {
@@ -253,6 +253,7 @@ static_library("metrics") {
"motherboard_metrics_provider.h",
]
}
patches/components-metrics-machine_id_provider_win.cc.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/components/metrics/machine_id_provider_win.cc b/components/metrics/machine_id_provider_win.cc
index 4e2ad726cc66afca62141c7ed7536b3e65c4b3a7..167cc1d08859b79f0d63bb904758505a5c690611 100644
index c92ad1f2eabd04b5f4219e480b4c784f4c88c1e0..ddbf106071876087eb2c01128513311f99c8fcde 100644
--- a/components/metrics/machine_id_provider_win.cc
+++ b/components/metrics/machine_id_provider_win.cc
@@ -18,7 +18,7 @@ namespace metrics {
@@ -19,7 +19,7 @@ namespace metrics {
// static
bool MachineIdProvider::HasId() {
patches/components-omnibox-browser-autocomplete_controller.cc.patch
+3 -3
View File
@@ -1,8 +1,8 @@
diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/omnibox/browser/autocomplete_controller.cc
index f339bef319c6ac6e5514fc9bab166aec0a1b6f2f..c68542a733ceeb52e582d1a48dcdb932ad038df4 100644
index e71e8fc86f528735e741db7f5535ad86d3cd84da..bc300c1e8f81c7cee5f693fcb327dcfdd3a59a50 100644
--- a/components/omnibox/browser/autocomplete_controller.cc
+++ b/components/omnibox/browser/autocomplete_controller.cc
@@ -781,6 +781,7 @@ void AutocompleteController::InitializeAsyncProviders(int provider_types) {
@@ -791,6 +791,7 @@ void AutocompleteController::InitializeAsyncProviders(int provider_types) {
if (provider_types & AutocompleteProvider::TYPE_SEARCH) {
search_provider_ = new SearchProvider(provider_client_.get(), this);
providers_.push_back(search_provider_.get());
@@ -10,7 +10,7 @@ index f339bef319c6ac6e5514fc9bab166aec0a1b6f2f..c68542a733ceeb52e582d1a48dcdb932
}
// Providers run in the order they're added. Add `HistoryURLProvider` after
// `SearchProvider` because:
@@ -946,6 +947,7 @@ void AutocompleteController::UpdateResult(
@@ -956,6 +957,7 @@ void AutocompleteController::UpdateResult(
#if DCHECK_IS_ON()
result_.Validate();
#endif // DCHECK_IS_ON()
patches/components-omnibox-browser-omnibox_edit_model.cc.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/components/omnibox/browser/omnibox_edit_model.cc b/components/omnibox/browser/omnibox_edit_model.cc
index 1c170e8021899a9cd7c344091a2e680d4460a72e..80d8e8c4c0ae0ffa18fd152620af44a859142804 100644
index f5acbb59c14c4d997c784ac38c9697e3a291ba0b..967a08e5180fc2edfd60989f58a0d63aa857edd4 100644
--- a/components/omnibox/browser/omnibox_edit_model.cc
+++ b/components/omnibox/browser/omnibox_edit_model.cc
@@ -493,6 +493,7 @@ void OmniboxEditModel::AdjustTextForCopy(int sel_min,
patches/components-password_manager-core-browser-login_database.cc.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/components/password_manager/core/browser/login_database.cc b/components/password_manager/core/browser/login_database.cc
index 6fc77e9f541a4ed821ae927873e5c4c16b6bd330..036f26a4f36150c2e312e7ee6ebdcd733dc01a60 100644
index ad113000d144a7ce13377b97bf683cba44046507..9119c4bb54eae9a4a652af2211aaca465848a953 100644
--- a/components/password_manager/core/browser/login_database.cc
+++ b/components/password_manager/core/browser/login_database.cc
@@ -1858,6 +1858,7 @@ FormRetrievalResult LoginDatabase::StatementToForms(
@@ -1905,6 +1905,7 @@ FormRetrievalResult LoginDatabase::StatementToForms(
EncryptionResult result = InitPasswordFormFromStatement(
*statement, /*decrypt_and_fill_password_value=*/true, new_form.get());
patches/components-safe_browsing-core-common-safe_browsing_prefs.cc.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/components/safe_browsing/core/common/safe_browsing_prefs.cc b/components/safe_browsing/core/common/safe_browsing_prefs.cc
index df8eb09cef1f656b5e12c009b3bc4b85a6350108..c473230391e256fa1080e38e0a681f31145581c8 100644
index cc1ec516886446ddf9c9f72a18e8825d485e5aba..2c2083ab2940ae8338755be0c3985d612ec81726 100644
--- a/components/safe_browsing/core/common/safe_browsing_prefs.cc
+++ b/components/safe_browsing/core/common/safe_browsing_prefs.cc
@@ -152,6 +152,7 @@ bool IsSafeBrowsingEnabled(const PrefService& prefs) {
@@ -154,6 +154,7 @@ bool IsSafeBrowsingEnabled(const PrefService& prefs) {
}
bool IsEnhancedProtectionEnabled(const PrefService& prefs) {
patches/components-search_engines-prepopulated_engines.json.patch
+2 -2
View File
@@ -1,5 +1,5 @@
diff --git a/components/search_engines/prepopulated_engines.json b/components/search_engines/prepopulated_engines.json
index 6f3c22cfe9d3a2e1856c8f7a137f2ffc9fe784bf..71a75a0f5969cb331b3c8efe040dead00ad56c31 100644
index 45bce68735d403a3b997caf0fc900a0e1cf4c92e..7c5a66362d60345fc31ed2208caf2fb2d214b856 100644
--- a/components/search_engines/prepopulated_engines.json
+++ b/components/search_engines/prepopulated_engines.json
@@ -91,17 +91,6 @@
@@ -20,7 +20,7 @@ index 6f3c22cfe9d3a2e1856c8f7a137f2ffc9fe784bf..71a75a0f5969cb331b3c8efe040dead0
"ecosia": {
"name": "Ecosia",
"keyword": "ecosia.org",
@@ -175,16 +164,6 @@
@@ -174,16 +163,6 @@
"id": 102
},
patches/components-sync-protocol-proto_visitors.h.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/components/sync/protocol/proto_visitors.h b/components/sync/protocol/proto_visitors.h
index 5336ecd952eae48c77a72c9126b3c0c8c72b69ae..6c616fe2447420c7ca7052fd49e7f9b55183ec36 100644
index c31669bb557f519601348cedab1db79702aedde1..9bab8b9313a3d88b100f9147fa610a14bb44cd48 100644
--- a/components/sync/protocol/proto_visitors.h
+++ b/components/sync/protocol/proto_visitors.h
@@ -480,6 +480,7 @@ VISIT_PROTO_FIELDS(const sync_pb::DeviceInfoSpecifics& proto) {
patches/components-sync_device_info-device_info_sync_bridge.cc.patch
+2 -2
View File
@@ -1,5 +1,5 @@
diff --git a/components/sync_device_info/device_info_sync_bridge.cc b/components/sync_device_info/device_info_sync_bridge.cc
index af24e1423a54c447566bd3bda6da9593b2c020b0..9db4a59508636cb8f0e98db0833414bde76a9502 100644
index fef10df714e4613f8d412b80614d1e49cca85dcf..c12be507da726d71620605af187409f16889324e 100644
--- a/components/sync_device_info/device_info_sync_bridge.cc
+++ b/components/sync_device_info/device_info_sync_bridge.cc
@@ -273,6 +273,7 @@ std::unique_ptr<DeviceInfoSpecifics> MakeLocalDeviceSpecifics(
@@ -35,7 +35,7 @@ index af24e1423a54c447566bd3bda6da9593b2c020b0..9db4a59508636cb8f0e98db0833414bd
// In the regular case for sync being disabled, wait for MergeSyncData()
// before initializing the LocalDeviceInfoProvider.
if (!metadata_batch->GetModelTypeState().initial_sync_done() &&
@@ -950,6 +953,7 @@ DeviceInfoSyncBridge::CountActiveDevicesByType() const {
@@ -952,6 +955,7 @@ DeviceInfoSyncBridge::CountActiveDevicesByType() const {
}
void DeviceInfoSyncBridge::ExpireOldEntries() {
patches/components-translate-content-renderer-translate_agent.cc.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/components/translate/content/renderer/translate_agent.cc b/components/translate/content/renderer/translate_agent.cc
index 09f78eae628954a58e4840c9b09b5d01479b2fea..3896066812e6e173da427450ea5955a8078b84c0 100644
index 4ac3e40649743c1d4a47b50d7ff1737c10de5a1f..050d05e7ed5d93ccd70b74dc6105c069ee31beb8 100644
--- a/components/translate/content/renderer/translate_agent.cc
+++ b/components/translate/content/renderer/translate_agent.cc
@@ -57,7 +57,7 @@ const int kTranslateInitCheckDelayMs = 150;
patches/content-browser-browser_main_runner_impl.cc.patch
+2 -2
View File
@@ -1,5 +1,5 @@
diff --git a/content/browser/browser_main_runner_impl.cc b/content/browser/browser_main_runner_impl.cc
index 4ddddc088cc900ca7dbf48807e49ee1d14c5a1ca..769c9f45c79e353b1246ccb6218768b34a46117b 100644
index 1ce7217210d790fa954841ac04858f43fe632307..c5f897a7ba88d76c9d602d916867a586ba755cd9 100644
--- a/content/browser/browser_main_runner_impl.cc
+++ b/content/browser/browser_main_runner_impl.cc
@@ -18,6 +18,7 @@
@@ -10,7 +10,7 @@ index 4ddddc088cc900ca7dbf48807e49ee1d14c5a1ca..769c9f45c79e353b1246ccb6218768b3
#include "build/build_config.h"
#include "components/tracing/common/trace_startup_config.h"
#include "components/tracing/common/tracing_switches.h"
@@ -104,7 +105,7 @@ int BrowserMainRunnerImpl::Initialize(MainFunctionParams parameters) {
@@ -105,7 +106,7 @@ int BrowserMainRunnerImpl::Initialize(MainFunctionParams parameters) {
auto created_main_parts_closure =
std::move(parameters.created_main_parts_closure);
patches/content-browser-renderer_host-navigation_controller_impl.cc.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/content/browser/renderer_host/navigation_controller_impl.cc b/content/browser/renderer_host/navigation_controller_impl.cc
index 8c0177e7efd6e4e5cfb694cdd88d2c331293412e..937a1865a3a2d827e6b28f2a38383f67fc59fff7 100644
index 358540b5dc87759904db9f777ceb64d5f37aadd5..76d294c787ef108b75cf9b6c4113fd9e68b0c3b4 100644
--- a/content/browser/renderer_host/navigation_controller_impl.cc
+++ b/content/browser/renderer_host/navigation_controller_impl.cc
@@ -3514,16 +3514,17 @@ base::WeakPtr<NavigationHandle> NavigationControllerImpl::NavigateWithoutEntry(
patches/content-browser-renderer_host-navigation_request.cc.patch
+3 -3
View File
@@ -1,8 +1,8 @@
diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc
index a4dc9781f9499fb24a245b844d62445d0d4ae538..b8b861e11a3fd15f0650f29d51a400d5f6c7ea77 100644
index b7282ff3e8e177b3f9eeb392a3c37c065964a63a..3ec7c7d74303349278f736f9924fcc2232ebf432 100644
--- a/content/browser/renderer_host/navigation_request.cc
+++ b/content/browser/renderer_host/navigation_request.cc
@@ -3024,6 +3024,7 @@ void NavigationRequest::OnRequestRedirected(
@@ -3074,6 +3074,7 @@ void NavigationRequest::OnRequestRedirected(
common_params_->url = redirect_info.new_url;
common_params_->method = redirect_info.new_method;
common_params_->referrer->url = GURL(redirect_info.new_referrer);
@@ -10,7 +10,7 @@ index a4dc9781f9499fb24a245b844d62445d0d4ae538..b8b861e11a3fd15f0650f29d51a400d5
common_params_->referrer = Referrer::SanitizeForRequest(
common_params_->url, *common_params_->referrer);
@@ -4496,6 +4497,7 @@ void NavigationRequest::OnStartChecksComplete(
@@ -4551,6 +4552,7 @@ void NavigationRequest::OnStartChecksComplete(
headers.MergeFrom(TakeModifiedRequestHeaders());
begin_params_->headers = headers.ToString();
patches/content-public-browser-content_browser_client.h.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
index 20f825d288157ed234f0da811be32f49c7716445..84c9df833e9f0537b6779f5cefece19c3f469a87 100644
index ceff9665cdb15dc796bca5f6810ab040678d4476..e918d1e2cbf9ead445adf582e1f7b3d39f52744d 100644
--- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h
@@ -2071,6 +2071,7 @@ class CONTENT_EXPORT ContentBrowserClient {
@@ -2074,6 +2074,7 @@ class CONTENT_EXPORT ContentBrowserClient {
virtual ui::AXMode GetAXModeForBrowserContext(
BrowserContext* browser_context);
patches/content-renderer-render_frame_impl.cc.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index a1d8df23d99d139bdfa2ba6eb56e3b75d7498578..3baa06e56cb6461340752f44e1ce4653a317fbd5 100644
index 05698907036df68b66be20a09720264233ef45ad..6e9195c7544a8b683ecfcb0342f7de29c9345a85 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -4416,6 +4416,7 @@ bool RenderFrameImpl::ShouldUseUserAgentOverride() const {
@@ -4418,6 +4418,7 @@ bool RenderFrameImpl::ShouldUseUserAgentOverride() const {
// Temporarily return early and fix properly as part of
// https://crbug.com/426555.
if (web_view->MainFrame()->IsWebRemoteFrame())
patches/extensions-browser-api-web_request-web_request_api.cc.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/extensions/browser/api/web_request/web_request_api.cc b/extensions/browser/api/web_request/web_request_api.cc
index dda07a81262bf01591224378c8c8385faad854e0..41eb9bc24622ab6f9fa0ae6b97faac00c1c4ece2 100644
index ee2964856703b6cfaf0fcd6e9e8fdf3b18dc78c0..a3e9e23efd740fe86a86438e0e1acf59e74a7087 100644
--- a/extensions/browser/api/web_request/web_request_api.cc
+++ b/extensions/browser/api/web_request/web_request_api.cc
@@ -1415,6 +1415,9 @@ ExtensionWebRequestEventRouter::OnAuthRequired(
patches/sandbox-policy-win-sandbox_win.cc.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/sandbox/policy/win/sandbox_win.cc b/sandbox/policy/win/sandbox_win.cc
index ab87f74e3e4099bfc62d095e78703132d083b0e4..35608cc21e2bfcc48c528cd2596bca8aebe5a5f3 100644
index fe0394187eae7ac6ab79963222e503050d679b54..3e345b29adcb81af9f5dd5641b326d15a7a7ca5b 100644
--- a/sandbox/policy/win/sandbox_win.cc
+++ b/sandbox/policy/win/sandbox_win.cc
@@ -737,6 +737,7 @@ ResultCode LaunchWithoutSandbox(
@@ -736,6 +736,7 @@ ResultCode LaunchWithoutSandbox(
base::Process* process) {
base::LaunchOptions options;
options.handles_to_inherit = handles_to_inherit;
patches/third_party-blink-renderer-bindings-BUILD.gn.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/third_party/blink/renderer/bindings/BUILD.gn b/third_party/blink/renderer/bindings/BUILD.gn
index 488b2ddf8462dbb9a85eb010818265e92a6e8c53..9971e8f977ed027c92807e83da1789dc8726f5db 100644
index f2995b404fd5fb48f3dd3bfa5bd59507912f6942..89090967a219f29bbf395460b69c8634939f5e39 100644
--- a/third_party/blink/renderer/bindings/BUILD.gn
+++ b/third_party/blink/renderer/bindings/BUILD.gn
@@ -173,6 +173,7 @@ template("generate_bindings") {
@@ -174,6 +174,7 @@ template("generate_bindings") {
args += invoker.targets
deps = [ ":web_idl_database" ]
patches/third_party-blink-renderer-bindings-core-v8-v8_script_runner.cc.patch
+3 -3
View File
@@ -1,8 +1,8 @@
diff --git a/third_party/blink/renderer/bindings/core/v8/v8_script_runner.cc b/third_party/blink/renderer/bindings/core/v8/v8_script_runner.cc
index 1ddfdb5444976de72e4d2ae42275de026c8c837d..55559f3b166f6e7a63225284014f618fd11e9127 100644
index c909cb6a5003ae5e41c453f556d92dde7ea06739..d660b5d6f1ea292178771fdddcda0200674ed1b8 100644
--- a/third_party/blink/renderer/bindings/core/v8/v8_script_runner.cc
+++ b/third_party/blink/renderer/bindings/core/v8/v8_script_runner.cc
@@ -225,7 +225,7 @@ int GetMicrotasksScopeDepth(v8::Isolate* isolate,
@@ -228,7 +228,7 @@ int GetMicrotasksScopeDepth(v8::Isolate* isolate,
} // namespace
@@ -11,7 +11,7 @@ index 1ddfdb5444976de72e4d2ae42275de026c8c837d..55559f3b166f6e7a63225284014f618f
ScriptState* script_state,
const ClassicScript& classic_script,
v8::ScriptOrigin origin,
@@ -269,7 +269,7 @@ v8::MaybeLocal<v8::Script> V8ScriptRunner::CompileScript(
@@ -272,7 +272,7 @@ v8::MaybeLocal<v8::Script> V8ScriptRunner::CompileScript(
return script;
}
patches/third_party-blink-renderer-core-BUILD.gn.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/third_party/blink/renderer/core/BUILD.gn b/third_party/blink/renderer/core/BUILD.gn
index d99aba7b8da009d5f98835ed48a4887e1862b34b..67d3a756f8e1a2792be1c99222b383d8c0d21b5a 100644
index c3d960bf0c7f76e54b2e43cf25c066df345db3ae..42f782a688d83fc168fef02d4bbc0d3599f0f6dd 100644
--- a/third_party/blink/renderer/core/BUILD.gn
+++ b/third_party/blink/renderer/core/BUILD.gn
@@ -391,6 +391,7 @@ component("core") {
@@ -392,6 +392,7 @@ component("core") {
"Carbon.framework",
]
}
patches/third_party-blink-renderer-modules-canvas-canvas2d-base_rendering_context_2d.cc.patch
+3 -3
View File
@@ -1,8 +1,8 @@
diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc
index 39e73f010bf17fa76e4eba58eadfbeb3e87d91e5..cb6a6251b6b9a704193c0cdb7d9de58d8ff969b6 100644
index 55a13dd7d1e9eb85673c93fbbe35a7718a9d243e..adf6d96d36e462f0809eef0b3ea2c2f62f7db007 100644
--- a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc
+++ b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc
@@ -1952,6 +1952,7 @@ ImageData* BaseRenderingContext2D::getImageData(
@@ -1950,6 +1950,7 @@ ImageData* BaseRenderingContext2D::getImageData(
}
ImageData* BaseRenderingContext2D::getImageDataInternal(
@@ -10,7 +10,7 @@ index 39e73f010bf17fa76e4eba58eadfbeb3e87d91e5..cb6a6251b6b9a704193c0cdb7d9de58d
int sx,
int sy,
int sw,
@@ -2092,6 +2093,7 @@ ImageData* BaseRenderingContext2D::getImageDataInternal(
@@ -2090,6 +2091,7 @@ ImageData* BaseRenderingContext2D::getImageDataInternal(
DCHECK(!bounds.intersect(SkIRect::MakeXYWH(sx, sy, sw, sh)));
}
}
patches/third_party-blink-renderer-modules-mediastream-media_devices.cc.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/third_party/blink/renderer/modules/mediastream/media_devices.cc b/third_party/blink/renderer/modules/mediastream/media_devices.cc
index 9fae347c8b156aa5a7c4e1bdb8a38a61161b2d80..f34f0e0c1c57536e92c6e2ee3a7388abde4fe3b3 100644
index f98910deabee0739af226aa8c8348ba076b35748..2853b2883f96fa97836b47c7ce73e481ef431744 100644
--- a/third_party/blink/renderer/modules/mediastream/media_devices.cc
+++ b/third_party/blink/renderer/modules/mediastream/media_devices.cc
@@ -907,6 +907,7 @@ void MediaDevices::DevicesEnumerated(
@@ -912,6 +912,7 @@ void MediaDevices::DevicesEnumerated(
}
}
patches/third_party-blink-renderer-platform-BUILD.gn.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/renderer/platform/BUILD.gn
index 5c1b197ce4e711f015421cb95acd06e42b7657a7..1f7dc3964e761bfd3c3bfd9bb298967b67848ad6 100644
index 57d5c2bd2910fc9f0109bde338a4fca00d7872f5..250d5de6b9cd61a060b20e8903df409aa46dba4b 100644
--- a/third_party/blink/renderer/platform/BUILD.gn
+++ b/third_party/blink/renderer/platform/BUILD.gn
@@ -1850,6 +1850,7 @@ component("platform") {
patches/tools-licenses-licenses.py.patch
+4 -4
View File
@@ -1,5 +1,5 @@
diff --git a/tools/licenses/licenses.py b/tools/licenses/licenses.py
index 6f2e1a707767462e7b0e6909149cc16e6b22e62c..d5864836ce10b02c4e4f692e02cb47875e5d68c0 100755
index e56688f7ab2a8b0ee59d0b7389e4c87370c8fad2..dde0c9c30e71258076379851162d7a345c3e055c 100755
--- a/tools/licenses/licenses.py
+++ b/tools/licenses/licenses.py
@@ -39,6 +39,7 @@ from spdx_writer import SpdxWriter
@@ -10,7 +10,7 @@ index 6f2e1a707767462e7b0e6909149cc16e6b22e62c..d5864836ce10b02c4e4f692e02cb4787
# Paths from the root of the tree to directories to skip.
@@ -385,6 +386,7 @@ SPECIAL_CASES = {
@@ -384,6 +385,7 @@ SPECIAL_CASES = {
"License File": "/third_party/selenium-atoms/LICENSE.closure",
},
}
@@ -18,7 +18,7 @@ index 6f2e1a707767462e7b0e6909149cc16e6b22e62c..d5864836ce10b02c4e4f692e02cb4787
# Special value for 'License File' field used to indicate that the license file
# should not be used in about:credits.
@@ -578,7 +580,8 @@ def FindThirdPartyDirs(prune_paths, root, extra_third_party_dirs=None):
@@ -577,7 +579,8 @@ def FindThirdPartyDirs(prune_paths, root, extra_third_party_dirs=None):
if skip in dirs:
dirs.remove(skip)
@@ -28,7 +28,7 @@ index 6f2e1a707767462e7b0e6909149cc16e6b22e62c..d5864836ce10b02c4e4f692e02cb4787
# Add all subdirectories that are not marked for skipping.
for dir in dirs:
dirpath = os.path.join(path, dir)
@@ -801,7 +804,8 @@ def GenerateCredits(file_template_file,
@@ -800,7 +803,8 @@ def GenerateCredits(file_template_file,
for path in third_party_dirs:
try:
metadata = ParseDir(path, _REPOSITORY_ROOT)
patches/tools-metrics-histograms-metadata-histogram_suffixes_list.xml.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/tools/metrics/histograms/metadata/histogram_suffixes_list.xml b/tools/metrics/histograms/metadata/histogram_suffixes_list.xml
index e661840b1711469d283186fa0aeb8a90157ca8c6..b08aa62e6b55618e3727bc64ee537b4afe0760f0 100644
index 95fec574f8197208478b9ac4adc58d07b86cd601..d0c25830c8039521fea36675f30e086b0e3cdeb2 100644
--- a/tools/metrics/histograms/metadata/histogram_suffixes_list.xml
+++ b/tools/metrics/histograms/metadata/histogram_suffixes_list.xml
@@ -3925,6 +3925,7 @@ chromium-metrics-reviews@google.com.
@@ -3923,6 +3923,7 @@ chromium-metrics-reviews@google.com.
<suffix name="ProtectedMedia" label="Protected media permission"/>
<suffix name="PushMessaging" label="Push messaging permission"/>
<suffix name="Quota" label="Quota permission"/>
patches/tools-typescript-ts_library.py.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/tools/typescript/ts_library.py b/tools/typescript/ts_library.py
index b99bbfa88756921784ce859becf7ada6ccd0daaa..8adca6553bcb950c14343d3f9ae3c6d71fcc61d3 100644
index 104c1f8d655a0daf1b1d93a56edb3d632d9c489e..7c622d6b9fa83102bf79e58a8f44e92a65363a63 100644
--- a/tools/typescript/ts_library.py
+++ b/tools/typescript/ts_library.py
@@ -249,5 +249,6 @@ def main(argv):
@@ -252,5 +252,6 @@ def main(argv):
json.dump(manifest_data, manifest_file)
patches/v8/BUILD.gn.patch
+2 -2
View File
@@ -1,5 +1,5 @@
diff --git a/BUILD.gn b/BUILD.gn
index 078030ef2b4bbe91a0018891ea1b3f7d49397f53..957d762c7fc0b955f3d4c64a6f91e0fdd7d09cba 100644
index 277f47717da3ddfc528786feb6be29e5ee46a0f5..b36e72040c57a891bb75b31c97c548338c6ad1fb 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -660,6 +660,7 @@ config("internal_config_base") {
@@ -10,7 +10,7 @@ index 078030ef2b4bbe91a0018891ea1b3f7d49397f53..957d762c7fc0b955f3d4c64a6f91e0fd
}
config("internal_config") {
@@ -2697,6 +2698,7 @@ v8_header_set("v8_headers") {
@@ -2701,6 +2702,7 @@ v8_header_set("v8_headers") {
":cppgc_headers",
":v8_version",
]