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

Update patches from Chromium 109.0.5396.2 to Chromium 109.0.5409.0.

Browse Source
This commit is contained in:
Claudio DeSouza
2022-12-15 14:18:48 -05:00
committed by Max Karolinskiy
parent 1d6b25f2b6
commit 7dcddf8a22
78 changed files with 152 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files
patches/PRESUBMIT.py.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/PRESUBMIT.py b/PRESUBMIT.py
index a22016db5a0811112c9778014bcfc52b111923a1..39a6e35879f12abc8f9a60e1a9d768aa1704be07 100644
index 54d848855461647c0f890202e7e0bed7bf19da3e..b224b673007f10765df36498d93b73c75f4ca823 100644
--- a/PRESUBMIT.py
+++ b/PRESUBMIT.py
@@ -6681,3 +6681,4 @@ def CheckNoJsInIos(input_api, output_api):
@@ -6689,3 +6689,4 @@ def CheckNoJsInIos(input_api, output_api):
'scripts on iOS.', error_paths))
return results
patches/base-BUILD.gn.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/base/BUILD.gn b/base/BUILD.gn
index c9a7760710ce776201647579500444434c4f15ae..c27b3183fc03bb4eac6d91443e553f4161bd7aa7 100644
index 92f38639628933381c0218f41a0a506a03c60383..0075ab340d749dd8fcc6d85673fe520308ca2566 100644
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
@@ -4346,6 +4346,7 @@ if (is_android) {
@@ -4348,6 +4348,7 @@ if (is_android) {
"android/java/src/org/chromium/base/task/TaskTraits.java",
"android/java/src/org/chromium/base/task/TaskTraitsExtensionDescriptor.java",
]
patches/base-threading-thread_restrictions.h.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/base/threading/thread_restrictions.h b/base/threading/thread_restrictions.h
index 0d3af334c1a4cca6ff0e36a308b37e0c1804085b..55cd749feaac512a5fd4003c3f468af5395b19c3 100644
index 07fe653bd2d231b3dcab405dec5da21a576aa5d5..21aedf6ab87b27e0646e4d36d3320ffa434a9161 100644
--- a/base/threading/thread_restrictions.h
+++ b/base/threading/thread_restrictions.h
@@ -560,6 +560,7 @@ class BASE_EXPORT ScopedAllowBaseSyncPrimitives {
@@ -665,6 +665,7 @@ class BASE_EXPORT ScopedAllowBaseSyncPrimitives {
ScopedAllowBaseSyncPrimitives& operator=(
const ScopedAllowBaseSyncPrimitives&) = delete;
patches/build-config-BUILDCONFIG.gn.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn
index 818ac10ac12357702bab267d7d9fc2a720050624..4ca29794812370149a328a0609a97d8e105be35c 100644
index a373e55a330f7c8f330be9f430c7e1f41ead42f7..6cb069af5e1d9596d45113dd762ea7cce5e0a7bb 100644
--- a/build/config/BUILDCONFIG.gn
+++ b/build/config/BUILDCONFIG.gn
@@ -329,6 +329,7 @@ is_posix = !is_win && !is_fuchsia
patches/build-config-chrome_build.gni.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/build/config/chrome_build.gni b/build/config/chrome_build.gni
index 39160b15d1d50fb19ddec31b39932692b47ae0c1..0ba6982721aeecf34e6d714c6eb6c4555526dfc9 100644
index 2207912e73af6a792abefd7ade4b5c36199387d8..e339972df8b6a2e9d4daf67a32be9daa237b5cda 100644
--- a/build/config/chrome_build.gni
+++ b/build/config/chrome_build.gni
@@ -1,6 +1,7 @@
patches/build-util-android_chrome_version.py.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/build/util/android_chrome_version.py b/build/util/android_chrome_version.py
index 549e750ba8abc42040bdfaba18522b18b8db7be3..823473804f09038e97d50d5adc822a8b26146713 100755
index 910e304bac436e4a81356b871f2feed7a7d14c5a..50ca7229722fb02fb7b146d9f1866796b4d69932 100755
--- a/build/util/android_chrome_version.py
+++ b/build/util/android_chrome_version.py
@@ -278,7 +278,7 @@ def GenerateVersionCodes(version_values, arch, is_next_build):
@@ -281,7 +281,7 @@ def GenerateVersionCodes(version_values, arch, is_next_build):
"""
base_version_code = int(
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 1b993ad424b732b295db7ad53edb615838263139..ce28f748b32f047ced9b1ae9945e63166caf0f39 100644
index cef15d8e51d19306c0da91e21f46209095a4067a..d6a4e2ae202b8951e1c5611907d1645e7da2057f 100644
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -234,6 +234,7 @@ if (current_toolchain == default_toolchain) {
@@ -243,6 +243,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 1b993ad424b732b295db7ad53edb615838263139..ce28f748b32f047ced9b1ae9945e6316
}
android_resources("chrome_app_java_resources") {
@@ -309,6 +310,7 @@ if (current_toolchain == default_toolchain) {
@@ -318,6 +319,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 1b993ad424b732b295db7ad53edb615838263139..ce28f748b32f047ced9b1ae9945e6316
}
if (enable_vr) {
@@ -709,6 +711,7 @@ if (current_toolchain == default_toolchain) {
@@ -717,6 +719,7 @@ if (current_toolchain == default_toolchain) {
]
deps += feed_deps
@@ -26,7 +26,7 @@ index 1b993ad424b732b295db7ad53edb615838263139..ce28f748b32f047ced9b1ae9945e6316
srcjar_deps = [
":autofill_verification_status_generated_enum",
@@ -735,6 +738,7 @@ if (current_toolchain == default_toolchain) {
@@ -743,6 +746,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 1b993ad424b732b295db7ad53edb615838263139..ce28f748b32f047ced9b1ae9945e6316
# From java_sources.gni.
sources = chrome_java_sources + [ app_hooks_impl ]
@@ -876,6 +880,7 @@ if (current_toolchain == default_toolchain) {
@@ -884,6 +888,7 @@ if (current_toolchain == default_toolchain) {
"//chrome/android/features/tab_ui:module_desc_java",
]
}
@@ -42,7 +42,7 @@ index 1b993ad424b732b295db7ad53edb615838263139..ce28f748b32f047ced9b1ae9945e6316
}
action_with_pydeps("chrome_android_java_google_api_keys_srcjar") {
@@ -2091,6 +2096,7 @@ if (current_toolchain == default_toolchain) {
@@ -2101,6 +2106,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 1b993ad424b732b295db7ad53edb615838263139..ce28f748b32f047ced9b1ae9945e6316
# Dep needed to ensure override works properly.
deps = [ ":chrome_base_module_resources" ]
@@ -2339,6 +2345,7 @@ if (current_toolchain == default_toolchain) {
@@ -2349,6 +2355,7 @@ if (current_toolchain == default_toolchain) {
":${_variant}_locale_pak_assets",
":${_variant}_paks",
]
@@ -58,7 +58,7 @@ index 1b993ad424b732b295db7ad53edb615838263139..ce28f748b32f047ced9b1ae9945e6316
if (_is_monochrome) {
deps += [ "//android_webview:locale_pak_assets" ]
if (webview_includes_weblayer && !_is_bundle_module) {
@@ -2551,6 +2558,7 @@ if (current_toolchain == default_toolchain) {
@@ -2561,6 +2568,7 @@ if (current_toolchain == default_toolchain) {
load_library_from_apk = chromium_linker_supported
version_name = chrome_version_name
@@ -66,7 +66,7 @@ index 1b993ad424b732b295db7ad53edb615838263139..ce28f748b32f047ced9b1ae9945e6316
}
}
@@ -2694,6 +2702,7 @@ if (current_toolchain == default_toolchain) {
@@ -2704,6 +2712,7 @@ if (current_toolchain == default_toolchain) {
"//components/payments/content/android:service_java",
"//third_party/androidx:androidx_browser_browser_java",
]
@@ -74,7 +74,7 @@ index 1b993ad424b732b295db7ad53edb615838263139..ce28f748b32f047ced9b1ae9945e6316
# More deps for DFMs.
if (dfmify_dev_ui) {
@@ -2871,6 +2880,7 @@ if (current_toolchain == default_toolchain) {
@@ -2889,6 +2898,7 @@ if (current_toolchain == default_toolchain) {
deps += [ "//weblayer/browser/java:upstream_java" ]
}
}
patches/chrome-android-chrome_java_sources.gni.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
index 40f02f4a2d91ff60b52f59cd33dceb56f6facaac..17ab943e85a03629c18faf9d4860ab4e6959d760 100644
index bfa14e02a827cf4a8daf70f282ffd6e8fd2828e0..3d5a6ad7629c90e9f744d6890c5fd686d6ff6e37 100644
--- a/chrome/android/chrome_java_sources.gni
+++ b/chrome/android/chrome_java_sources.gni
@@ -1224,3 +1224,4 @@ chrome_java_sources = [
patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
index 5df07363ae91b66acf00e608b332884782deb2d4..ac0430d4d7165a3198318a925697f00a2e8f4490 100644
index 93d7be8f351578de064d94bbe08647c990471e57..4835eff51993a00b2f51bf7d1b01e487c41dfd24 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
@@ -1051,7 +1051,7 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
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 8913b227352adad44ea3739ab9723bd724933023..ed9226152c3ab353dacceac5a1223aa6eaca2b2a 100644
index 9772b418de598e27a03d788c1c5e1d3a4c51429d..517747af9b57a812dd19f968d6aba982f380d5c9 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -2548,6 +2548,7 @@ static_library("browser") {
@@ -2528,6 +2528,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 4da1d5265ccf1ff44790bdd0fe139e776fa37869..d2503e602f6cec3b7d0d916f54832fcbf0649a4d 100644
index e45a66e727b09ea0d8f6fe1bcd8f99e691dacc4a..2bb430ff122a227e7abc2abf5054fe50dfb4e8d4 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -3627,6 +3627,7 @@ const FeatureEntry::FeatureVariation kFastCheckoutVariations[] = {
@@ -3624,6 +3624,7 @@ const FeatureEntry::FeatureVariation kFastCheckoutVariations[] = {
//
// When adding a new choice, add it to the end of the list.
const FeatureEntry kFeatureEntries[] = {
patches/chrome-browser-browsing_data-chrome_browsing_data_remover_delegate.h.patch
+3 -3
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h
index 62b28442f4eb719c225012a0ffc22e0adbb947f6..ace1e1e7541b5f28b98174f6878605d1fd945f95 100644
index ce198e3b37b0a1ab20a03513668232daaf8b145c..e1603233214b855b3c0dc1bc10368b8c503a53c1 100644
--- a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h
+++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h
@@ -94,6 +94,7 @@ class ChromeBrowsingDataRemoverDelegate
@@ -93,6 +93,7 @@ class ChromeBrowsingDataRemoverDelegate
void OverrideDomainReliabilityClearerForTesting(
DomainReliabilityClearer clearer);
@@ -10,7 +10,7 @@ index 62b28442f4eb719c225012a0ffc22e0adbb947f6..ace1e1e7541b5f28b98174f6878605d1
private:
using WebRtcEventLogManager = webrtc_event_logging::WebRtcEventLogManager;
@@ -147,11 +148,12 @@ class ChromeBrowsingDataRemoverDelegate
@@ -146,11 +147,12 @@ class ChromeBrowsingDataRemoverDelegate
kWebAppHistory = 42,
kWebAuthnCredentials = 43,
kWebrtcVideoPerfHistory = 44,
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 a948146e1786681ae8873af502320d0815b11c18..f9e2bd1b3444e65bfdce1682f0af6be0e22e49b1 100644
index a0e3409c4a782d80a567d937c455b7f67f8bfafd..99e5ebfe64158f195797415ead8c451e21279f7c 100644
--- a/chrome/browser/extensions/BUILD.gn
+++ b/chrome/browser/extensions/BUILD.gn
@@ -1367,6 +1367,7 @@ static_library("extensions") {
@@ -1370,6 +1370,7 @@ static_library("extensions") {
} else {
sources += [ "api/braille_display_private/braille_controller_stub.cc" ]
}
patches/chrome-browser-extensions-api-developer_private-extension_info_generator.cc.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/extensions/api/developer_private/extension_info_generator.cc b/chrome/browser/extensions/api/developer_private/extension_info_generator.cc
index 9fae101b9be74380712384031d0166bbf11fb54f..273c34f9fd867300da0b2ae95a20d5f53740ab32 100644
index 9d2564b0106b6d892ec6e0955a80ced259295e0c..12a8d16ff2cb53d990e032ea1753ea7070c013f8 100644
--- a/chrome/browser/extensions/api/developer_private/extension_info_generator.cc
+++ b/chrome/browser/extensions/api/developer_private/extension_info_generator.cc
@@ -624,6 +624,7 @@ void ExtensionInfoGenerator::CreateExtensionInfoHelper(
@@ -623,6 +623,7 @@ void ExtensionInfoGenerator::CreateExtensionInfoHelper(
info->incognito_access.is_enabled = util::CanBeIncognitoEnabled(&extension);
info->incognito_access.is_active =
util::IsIncognitoEnabled(extension.id(), browser_context_);
patches/chrome-browser-first_run-upgrade_util_win.cc.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/first_run/upgrade_util_win.cc b/chrome/browser/first_run/upgrade_util_win.cc
index a6b30b5fee3aa71fafd9b485bb2d24cd222cc584..c21ea12f22b1a3582148a38fbf2f8442457f54be 100644
index 3dc61391aad6f12e1ed61ae043c31cdde186fb1e..4075bd8a7db9a113fd8e0a0266a9a264eaf7d2c6 100644
--- a/chrome/browser/first_run/upgrade_util_win.cc
+++ b/chrome/browser/first_run/upgrade_util_win.cc
@@ -44,7 +44,7 @@
patches/chrome-browser-media-webrtc-webrtc_log_uploader.cc.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/media/webrtc/webrtc_log_uploader.cc b/chrome/browser/media/webrtc/webrtc_log_uploader.cc
index bf7a40ab756c6cfb553fe2ad43f458259c8c10cb..ce5900daee22ccdb79d4f8c107213cc80a9acf2e 100644
index c61883548003ea7f581868648d68715499d6b97b..920286db1cdd8e458c5a32dfd5763494cae01c6a 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) {
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 67fc2412c6025c0b2b7cc0130299981db09b0978..fa8684fc1589a15bcfbb459020a45b076969c3cc 100644
index 62381efd464d53e399d2b235eff3835b1911d90d..9dad02cc51fa31ac2165f7d400c369408d22610e 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -1258,6 +1258,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
@@ -1246,6 +1246,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
DeviceOAuth2TokenStoreDesktop::RegisterPrefs(registry);
#endif
@@ -11,7 +11,7 @@ index 67fc2412c6025c0b2b7cc0130299981db09b0978..fa8684fc1589a15bcfbb459020a45b07
#if BUILDFLAG(ENABLE_SCREEN_AI_SERVICE)
screen_ai::RegisterLocalStatePrefs(registry);
#endif // BUILDFLAG(ENABLE_SCREEN_AI_SERVICE)
@@ -1631,6 +1633,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
@@ -1618,6 +1620,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
registry->RegisterBooleanPref(prefs::kVirtualKeyboardResizesLayoutByDefault,
false);
#endif
patches/chrome-browser-renderer_context_menu-render_view_context_menu.h.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu.h b/chrome/browser/renderer_context_menu/render_view_context_menu.h
index 9894b71a542b1f01828a6d5d3a38d967baf53a25..44dd05dcfd8f025c3e241055d9a46b6e3e926d75 100644
index 3199231012c450b5b8a6a2fd4d3f14b64968088b..072a5c8d657015db632d0c40e437a18c4140cbea 100644
--- a/chrome/browser/renderer_context_menu/render_view_context_menu.h
+++ b/chrome/browser/renderer_context_menu/render_view_context_menu.h
@@ -170,6 +170,7 @@ class RenderViewContextMenu
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 04cbc3b2ffef66772e1f51d055f234eba5c9471a..6fffa3be32c3e0b6bcac6ffce46fa62e22e79fce 100644
index c7035b0dccead100a688156658107cab581ab144..fb36a52a8fac449e3042565d774bf3473f661f0c 100644
--- a/chrome/browser/resources/bookmarks/command_manager.ts
+++ b/chrome/browser/resources/bookmarks/command_manager.ts
@@ -427,7 +427,7 @@ export class BookmarksCommandManagerElement extends
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 51b8f70a92a4ca58d80553115e41f302d63f8db8..c980f79890281afb820aea874b3fa3626839da5a 100644
index 4b5c3ba6ffe222098e2c7831cde47e4eff2b8d42..5aaaa959eee9651c20a2e92e1777099d182708f2 100644
--- a/chrome/browser/resources/settings/site_settings/constants.ts
+++ b/chrome/browser/resources/settings/site_settings/constants.ts
@@ -46,6 +46,7 @@ export enum ContentSettingsTypes {
@@ -47,6 +47,7 @@ export enum ContentSettingsTypes {
// The following item is not in the C++ kContentSettingsTypeGroupNames, but it
// is used everywhere where ContentSettingsTypes is used in JS.
PDF_DOCUMENTS = 'pdfDocuments',
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 4643799b39bc2a9f3dfb7bf188e88aee5b3d326f..9e16a68826e43a062bf156979914c442ee31ecd2 100644
index 4e08f9721400d1d87247663a94beba6f41b52a0c..647612f030fde35b1b53b6b89d5be255ac56cbfa 100644
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -665,6 +665,7 @@ static_library("ui") {
@@ -668,6 +668,7 @@ static_library("ui") {
"//ui/webui",
"//v8:v8_version",
]
@@ -10,7 +10,7 @@ index 4643799b39bc2a9f3dfb7bf188e88aee5b3d326f..9e16a68826e43a062bf156979914c442
# TODO(crbug/925153): Remove this circular dependency.
allow_circular_includes_from = [
@@ -4012,10 +4013,13 @@ static_library("ui") {
@@ -4008,10 +4009,13 @@ static_library("ui") {
]
deps += [ "//google_update" ]
} else {
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 469c5c6678f1aa8cbbc81658f5b475bd484d3958..3a10879223b966126cb28084d9099602ac3b6c17 100644
index bec30f3f22ad9c4f53c05f369af244bd0fdd28a9..f934eff0c5569a7199d031be102123f70de8b974 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
@@ -386,6 +386,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC
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 88572adc1353b16c9584f614211db6a7f4ec6ad2..ebcd0afe35d07fcababc9ab2fc168ba40c68fbff 100644
index 7eca80fed385c81b22031d181ee2c01961f81d28..5fcf6969a108bfe4722086643689fc87742bc8ae 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -449,6 +449,7 @@ Browser* Browser::Create(const CreateParams& params) {
patches/chrome-browser-ui-browser_navigator.cc.patch
+3 -3
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/ui/browser_navigator.cc b/chrome/browser/ui/browser_navigator.cc
index 7325d0992024540e6a53bc253e37583cb3de0064..8a444da56ada2d645b05a73487606549950181d5 100644
index 6048fa087031e5769066234aa222f4a6affb1469..8989a1ba142496cba40401ef78985b3f5ca3c2a9 100644
--- a/chrome/browser/ui/browser_navigator.cc
+++ b/chrome/browser/ui/browser_navigator.cc
@@ -598,6 +598,7 @@ base::WeakPtr<content::NavigationHandle> Navigate(NavigateParams* params) {
@@ -592,6 +592,7 @@ base::WeakPtr<content::NavigationHandle> Navigate(NavigateParams* params) {
// Block any navigation requests in locked fullscreen mode.
return nullptr;
}
@@ -10,7 +10,7 @@ index 7325d0992024540e6a53bc253e37583cb3de0064..8a444da56ada2d645b05a73487606549
// Open System Apps in their standalone window if necessary.
// TODO(crbug.com/1096345): Remove this code after we integrate with intent
@@ -891,6 +892,7 @@ base::WeakPtr<content::NavigationHandle> Navigate(NavigateParams* params) {
@@ -885,6 +886,7 @@ base::WeakPtr<content::NavigationHandle> Navigate(NavigateParams* params) {
bool IsHostAllowedInIncognito(const GURL& url) {
std::string scheme = url.scheme();
base::StringPiece host = url.host_piece();
patches/chrome-browser-ui-views-page_info-page_info_view_factory.cc.patch
+1 -1
View File
@@ -1,5 +1,5 @@
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 6c6e8d11cb4f43d6fbe870ef2c6c8ef9e4635da5..ca365b785dbd69c18ad8f60359162cbd3542f932 100644
index 8b4755388baee1ee83b78fd01a6116b090069fe1..af7f343aa4ea07a92e2e63c7fb98cf4ad9ded088 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
@@ -247,6 +247,7 @@ const ui::ImageModel PageInfoViewFactory::GetPermissionIcon(
patches/chrome-browser-ui-webui-chrome_web_ui_controller_factory.cc.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
index 761d3115fc174ee1bfa9638debc54da37a6f24e5..a09e5ff639123dfd03470afe3666e4b3dc7305e7 100644
index 68058df5b08894a7a0f4ddd2bf2d58631fbf3a2b..dc86b799df42330b459b842854cde91645d90a95 100644
--- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
+++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
@@ -1442,6 +1442,7 @@ void ChromeWebUIControllerFactory::GetFaviconForURL(
@@ -1388,6 +1388,7 @@ void ChromeWebUIControllerFactory::GetFaviconForURL(
// static
ChromeWebUIControllerFactory* ChromeWebUIControllerFactory::GetInstance() {
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 39337f7f7887bed211729397a1a5124a6e69cd8a..c6918b0576580c74b5ed8cdf28f354ead44fbe68 100644
index 23d27bb2c78bfa657b766a4685f539928702b0a2..3b2c7d29a1bdbab4bd04cba264d54905b4ba141f 100644
--- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
+++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
@@ -3218,6 +3218,7 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source,
@@ -3220,6 +3220,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 b153126750131f79ae540fb0a5a2c2444b5544c2..ba40b5aba642226b588bae272ef84badb24d46d3 100644
index 315f61dde5a3bdb5ad75799bc7a2a3adce898476..6ff120b52dbe8e2c7ae789b09ccc870b3763ec33 100644
--- a/chrome/browser/ui/webui/settings/site_settings_helper.cc
+++ b/chrome/browser/ui/webui/settings/site_settings_helper.cc
@@ -169,6 +169,7 @@ const ContentSettingsTypeNameEntry kContentSettingsTypeGroupNames[] = {
@@ -173,6 +173,7 @@ const ContentSettingsTypeNameEntry kContentSettingsTypeGroupNames[] = {
// PPAPI_BROKER has been deprecated. The content setting is not used or
// called from UI, so we don't need a representation JS string.
{ContentSettingsType::DEPRECATED_PPAPI_BROKER, nullptr},
@@ -10,7 +10,7 @@ index b153126750131f79ae540fb0a5a2c2444b5544c2..ba40b5aba642226b588bae272ef84bad
};
static_assert(std::size(kContentSettingsTypeGroupNames) ==
@@ -357,6 +358,7 @@ bool HasRegisteredGroupName(ContentSettingsType type) {
@@ -361,6 +362,7 @@ bool HasRegisteredGroupName(ContentSettingsType type) {
}
ContentSettingsType ContentSettingsTypeFromGroupName(base::StringPiece name) {
patches/chrome-browser-web_applications-os_integration-web_app_shortcut_mac.mm.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/web_applications/os_integration/web_app_shortcut_mac.mm b/chrome/browser/web_applications/os_integration/web_app_shortcut_mac.mm
index 688fb7e62f3242e3213e55896e2bbe4fac0ce069..683e37f8fdf513a93373a86dca2f16ab38de720e 100644
index f0cdba3ae3464cef07c0dce25f2c34410f1e2753..54065109e334257ddd7705326cfeb0906001fae5 100644
--- a/chrome/browser/web_applications/os_integration/web_app_shortcut_mac.mm
+++ b/chrome/browser/web_applications/os_integration/web_app_shortcut_mac.mm
@@ -757,6 +757,7 @@ base::FilePath GetChromeAppsFolder() {
@@ -749,6 +749,7 @@ base::FilePath GetChromeAppsFolder() {
if (path.empty())
return path;
patches/chrome-common-BUILD.gn.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn
index 6f2601c586c995c1edd1f088d6ecb070af140c59..2309e9735efc9390a42e11247c69588a0e937aa6 100644
index d4b829723a3d83e2de969e6db60841b20900daa2..92a68ecc31827edddcca4dc2a48b26cef6e4c611 100644
--- a/chrome/common/BUILD.gn
+++ b/chrome/common/BUILD.gn
@@ -88,6 +88,7 @@ source_set("channel_info") {
patches/chrome-common-importer-importer_data_types.h.patch
+3 -3
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/common/importer/importer_data_types.h b/chrome/common/importer/importer_data_types.h
index 1347b4ed67fd93726d4b22702603704c358aac60..5bbb9074ec70da791629d10feaf8f438fa268bf2 100644
index 183af47c26576bb123afa00a929045129c4bd011..265ad0cb4393f557c7fce1a118b236e2663b5fb0 100644
--- a/chrome/common/importer/importer_data_types.h
+++ b/chrome/common/importer/importer_data_types.h
@@ -30,7 +30,7 @@ enum ImportItem {
@@ -29,7 +29,7 @@ enum ImportItem {
SEARCH_ENGINES = 1 << 4,
HOME_PAGE = 1 << 5,
AUTOFILL_FORM_DATA = 1 << 6,
@@ -11,7 +11,7 @@ index 1347b4ed67fd93726d4b22702603704c358aac60..5bbb9074ec70da791629d10feaf8f438
};
// Information about a profile needed by an importer to do import work.
@@ -110,6 +110,7 @@ enum VisitSource {
@@ -109,6 +109,7 @@ enum VisitSource {
VISIT_SOURCE_FIREFOX_IMPORTED = 1,
VISIT_SOURCE_IE_IMPORTED = 2,
VISIT_SOURCE_SAFARI_IMPORTED = 3,
patches/chrome-installer-linux-BUILD.gn.patch
+4 -4
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/installer/linux/BUILD.gn b/chrome/installer/linux/BUILD.gn
index 7ad5b69266db2fc5e54ad9c2c7aa7290b3ae9093..77691ebe40e7c673d837bc232ead4199a82a7c8a 100644
index 5639b9ffc996ece80ab74a358af5b1d71e5d1183..8ff49f799edbb1e9a51e701ae90288a9c7605cb5 100644
--- a/chrome/installer/linux/BUILD.gn
+++ b/chrome/installer/linux/BUILD.gn
@@ -88,6 +88,7 @@ if (build_with_internal_optimization_guide) {
@@ -34,7 +34,7 @@ index 7ad5b69266db2fc5e54ad9c2c7aa7290b3ae9093..77691ebe40e7c673d837bc232ead4199
outputs = [ "$root_out_dir/installer/common/{{source_file_part}}" ]
}
@@ -397,6 +401,7 @@ group("installer_deps") {
@@ -396,6 +400,7 @@ group("installer_deps") {
"//components/crash/core/app:chrome_crashpad_handler",
"//sandbox/linux:chrome_sandbox",
]
@@ -42,7 +42,7 @@ index 7ad5b69266db2fc5e54ad9c2c7aa7290b3ae9093..77691ebe40e7c673d837bc232ead4199
if (package_nacl) {
public_deps += [
":strip_nacl_helper",
@@ -457,6 +462,9 @@ group("installer_deps") {
@@ -456,6 +461,9 @@ group("installer_deps") {
template("linux_package") {
assert(defined(invoker.channel))
channel = invoker.channel
@@ -52,7 +52,7 @@ index 7ad5b69266db2fc5e54ad9c2c7aa7290b3ae9093..77691ebe40e7c673d837bc232ead4199
if (is_chrome_branded) {
package = "google-chrome"
@@ -624,3 +632,6 @@ linux_package("beta") {
@@ -623,3 +631,6 @@ linux_package("beta") {
linux_package("unstable") {
channel = "unstable"
}
patches/chrome-installer-linux-common-installer.include.patch
+3 -3
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/installer/linux/common/installer.include b/chrome/installer/linux/common/installer.include
index 6309df66f1f4b070a86e918e288de7d1beae7b41..a7d372ded336467083adb8c045d9a91142ef3d68 100644
index bbc0aed82acda9fdb9c0d65917350dd12dba8338..494ca028d0a2d6755b4d214c4466ac2591ab57f2 100644
--- a/chrome/installer/linux/common/installer.include
+++ b/chrome/installer/linux/common/installer.include
@@ -75,6 +75,7 @@ process_template() (
@@ -10,7 +10,7 @@ index 6309df66f1f4b070a86e918e288de7d1beae7b41..a7d372ded336467083adb8c045d9a911
-e "s#@@SNAPNAME@@#${SNAPNAME}#g" \
-e "s#@@PROGNAME@@#${PROGNAME}#g" \
-e "s#@@CHANNEL@@#${CHANNEL}#g" \
@@ -166,6 +167,8 @@ stage_install_common() {
@@ -165,6 +166,8 @@ stage_install_common() {
install -m 644 "${OUTPUTDIR}/ui_resources_100_percent.pak" "${STAGEDIR}/${INSTALLDIR}/"
fi
@@ -19,7 +19,7 @@ index 6309df66f1f4b070a86e918e288de7d1beae7b41..a7d372ded336467083adb8c045d9a911
# ICU data file; Necessary when the GN icu_use_data_file flag is true.
install -m 644 "${OUTPUTDIR}/icudtl.dat" "${STAGEDIR}/${INSTALLDIR}/"
@@ -309,11 +312,13 @@ stage_install_common() {
@@ -308,11 +311,13 @@ stage_install_common() {
# app icons
local icon_regex=".*product_logo_[0-9]\+\."
patches/chrome-installer-linux-debian-control.template.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/installer/linux/debian/control.template b/chrome/installer/linux/debian/control.template
index 03224f07c09f4d6d2a7c9778f797202197161f10..764952501ef14b317dabec07f1e0655f2dd9855d 100644
index 93c075c8822ff843cc44199669b59664a9cd2a8e..588bab340769807ac1c36da570d52dcf836fc0e6 100644
--- a/chrome/installer/linux/debian/control.template
+++ b/chrome/installer/linux/debian/control.template
@@ -1,11 +1,11 @@
patches/chrome-installer-mini_installer-BUILD.gn.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/installer/mini_installer/BUILD.gn b/chrome/installer/mini_installer/BUILD.gn
index 6b0c60f44dc941ff943f12643298de0c39691e4c..855fcc9970a21d2600f90fe6cff197acd5a9b462 100644
index f72c5456309222e51d570e5d14676f28a73b405b..77b2a7470934712ece924d5f085b4b9676d419ae 100644
--- a/chrome/installer/mini_installer/BUILD.gn
+++ b/chrome/installer/mini_installer/BUILD.gn
@@ -13,6 +13,7 @@ import("//third_party/icu/config.gni")
patches/chrome-installer-setup-BUILD.gn.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/installer/setup/BUILD.gn b/chrome/installer/setup/BUILD.gn
index 6e30d38a04639c92f5c8c7eb7d34dad34481b007..6096e351761bfb5914833febe34faaf39dd65427 100644
index b078dcbc6f99efbe2f70fc88fe78cd2109bca0dd..e757123cba905290c706e7093a8b802a32797b15 100644
--- a/chrome/installer/setup/BUILD.gn
+++ b/chrome/installer/setup/BUILD.gn
@@ -129,6 +129,7 @@ if (is_win) {
patches/chrome-renderer-BUILD.gn.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/renderer/BUILD.gn b/chrome/renderer/BUILD.gn
index 7454b1eafd4dc05961753f5c491c39d4ce788417..60c055981f22cb413b7c24881ff57ef8d4bf814c 100644
index 893347b565a89cd5907059b6e455e591ca64c7da..c6a74f93977303817752ee947d2623f57742b892 100644
--- a/chrome/renderer/BUILD.gn
+++ b/chrome/renderer/BUILD.gn
@@ -216,6 +216,7 @@ static_library("renderer") {
patches/chrome-renderer-worker_content_settings_client.h.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/renderer/worker_content_settings_client.h b/chrome/renderer/worker_content_settings_client.h
index 82021572584809367b972dfd22c464e79ff017e0..29668d5691a87ed18d8122f6af4b4fd0b80aee08 100644
index a928943d6ad88a0cc6bd4ae7402489e1540e0a87..1e608f44d68201bc5f3248c0181a0827a63b54f7 100644
--- a/chrome/renderer/worker_content_settings_client.h
+++ b/chrome/renderer/worker_content_settings_client.h
@@ -41,6 +41,7 @@ class WorkerContentSettingsClient : public blink::WebContentSettingsClient {
@@ -40,6 +40,7 @@ class WorkerContentSettingsClient : public blink::WebContentSettingsClient {
bool AllowScriptFromSource(bool enabled_per_settings,
const blink::WebURL& script_url) override;
bool ShouldAutoupgradeMixedContent() override;
patches/chrome-test-BUILD.gn.patch
+3 -3
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index c386988398205c6e46fff93bffcce4876ed58027..752e5c775499750b604a3ae7ceda184ce63ccfaf 100644
index 6d3cebf73f789a16d0c741dcd46511f26fd49d0c..062c4755733d4b0c07eaae5374f5ee96c1da759c 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -320,6 +320,7 @@ static_library("test_support") {
@@ -321,6 +321,7 @@ static_library("test_support") {
"//ui/gl",
]
@@ -10,7 +10,7 @@ index c386988398205c6e46fff93bffcce4876ed58027..752e5c775499750b604a3ae7ceda184c
data_deps = []
if (enable_pdf) {
@@ -5220,7 +5221,7 @@ config("disable_thinlto_cache_flags") {
@@ -5227,7 +5228,7 @@ config("disable_thinlto_cache_flags") {
}
config("pdb_larger_than_4gb") {
patches/components-content_settings-core-browser-content_settings_registry.cc.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc
index f0fa16dee46e1794189cae9eaeea3e095a87b89b..3c816ff8ac0b96727159277945167b09377876a9 100644
index df61abb7df02e2d155ae45d2a3f1c447f771c1ef..fc5af334608f2dcfc188f4983a1ddeff548ba814 100644
--- a/components/content_settings/core/browser/content_settings_registry.cc
+++ b/components/content_settings/core/browser/content_settings_registry.cc
@@ -654,6 +654,7 @@ void ContentSettingsRegistry::Init() {
@@ -666,6 +666,7 @@ void ContentSettingsRegistry::Init() {
ContentSettingsInfo::INHERIT_IN_INCOGNITO,
ContentSettingsInfo::PERSISTENT,
ContentSettingsInfo::EXCEPTIONS_ON_SECURE_ORIGINS_ONLY);
patches/components-history-core-browser-history_types.h.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/components/history/core/browser/history_types.h b/components/history/core/browser/history_types.h
index 480b44c70b6b6913eab8b6ce6020672935de5fb9..de1d7b51447c58f1357a5b56a0952bb0168b703b 100644
index 65849ab66754fba5e449f8e6b20f0688b9c73f37..df3fd0bbab1273a482294fc3ba7f4572b4617f66 100644
--- a/components/history/core/browser/history_types.h
+++ b/components/history/core/browser/history_types.h
@@ -52,6 +52,8 @@ enum VisitSource {
patches/components-omnibox-browser-autocomplete_controller.cc.patch
+2 -2
View File
@@ -1,5 +1,5 @@
diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/omnibox/browser/autocomplete_controller.cc
index 693b39a980bc0ae46c2178197e35319f1d00244c..b4e4924249eabb9f0173bf255038e5d9156f5e33 100644
index 3d4d53f3a2a77359c6068157a45abb38de7da4b0..ffc53649a1abe968825af92b055e25d7d6d30ca7 100644
--- a/components/omnibox/browser/autocomplete_controller.cc
+++ b/components/omnibox/browser/autocomplete_controller.cc
@@ -397,6 +397,7 @@ AutocompleteController::AutocompleteController(
@@ -10,7 +10,7 @@ index 693b39a980bc0ae46c2178197e35319f1d00244c..b4e4924249eabb9f0173bf255038e5d9
}
// Providers run in the order they're added. Add `HistoryURLProvider` after
// `SearchProvider` because:
@@ -971,6 +972,7 @@ void AutocompleteController::UpdateResult(
@@ -977,6 +978,7 @@ void AutocompleteController::UpdateResult(
#if DCHECK_IS_ON()
result_.Validate();
#endif // DCHECK_IS_ON()
patches/components-omnibox-browser-omnibox_edit_model.cc.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/components/omnibox/browser/omnibox_edit_model.cc b/components/omnibox/browser/omnibox_edit_model.cc
index f9e44524d066105baeadc271271a2db3cace6af0..96131742918c937ff7ce635c2699ae2329682e4e 100644
index 6823f3902ed7527c22586f715256b93e5c32cc98..e84cfc88fdbbb880c1145b6d66b86203bd10eaf0 100644
--- a/components/omnibox/browser/omnibox_edit_model.cc
+++ b/components/omnibox/browser/omnibox_edit_model.cc
@@ -454,6 +454,7 @@ void OmniboxEditModel::AdjustTextForCopy(int sel_min,
@@ -455,6 +455,7 @@ void OmniboxEditModel::AdjustTextForCopy(int sel_min,
(*text == display_text_ || *text == url_for_editing_)) {
*url_from_text = controller()->GetLocationBarModel()->GetURL();
*write_url = true;
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 e208ca706c00dbd66dc7edd89a3b0cacf5e31dc5..f582baf9b85f6e4a171cfac31959ee9b9e2601fa 100644
index effe0b67e02a1a4f0071d1b415f4dc5c5784b7a4..a8f688dfb1cdb7d9f04e391125f2e7115e6f0f0a 100644
--- a/components/password_manager/core/browser/login_database.cc
+++ b/components/password_manager/core/browser/login_database.cc
@@ -1880,6 +1880,7 @@ FormRetrievalResult LoginDatabase::StatementToForms(
@@ -1878,6 +1878,7 @@ FormRetrievalResult LoginDatabase::StatementToForms(
EncryptionResult result = InitPasswordFormFromStatement(
*statement, /*decrypt_and_fill_password_value=*/true, &primary_key,
new_form.get());
patches/components-permissions-BUILD.gn.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/components/permissions/BUILD.gn b/components/permissions/BUILD.gn
index ec24ee3c055f4e942e49fbc8035dde3be1164e50..401948bc6496aa1b193cdbb4794edd62a81773cc 100644
index 704d471a34e2429fa338a784d92c6297d765e506..8cec2694a1d9f1a19718e8f8fc802aa6577f2774 100644
--- a/components/permissions/BUILD.gn
+++ b/components/permissions/BUILD.gn
@@ -143,6 +143,7 @@ source_set("permissions") {
patches/components-sync-engine-model_type_worker.h.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/components/sync/engine/model_type_worker.h b/components/sync/engine/model_type_worker.h
index 7c782ebecb658247f8d3ae2cdeb29389a91e853e..c3f2d7508839517358caadac5d4e01a32b9535f0 100644
index d92f30dc79edf26de0c21a549d651ff980571822..def8fd0ffdeb18cde9ab992c94b999ec62e5e2aa 100644
--- a/components/sync/engine/model_type_worker.h
+++ b/components/sync/engine/model_type_worker.h
@@ -210,6 +210,7 @@ class ModelTypeWorker : public UpdateHandler,
@@ -207,6 +207,7 @@ class ModelTypeWorker : public UpdateHandler,
static constexpr size_t kMaxPendingInvalidations = 10u;
patches/components-sync-engine-sync_scheduler_impl.cc.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/components/sync/engine/sync_scheduler_impl.cc b/components/sync/engine/sync_scheduler_impl.cc
index cbec111710fd01e709039caff355298fcf8e079a..66a954bf0aa4c164e34993a45c0539954f6539ee 100644
index b8ee801ec971de6c6e3b3e52c19cc32ef0a424cd..d953711147171cdff00821ffede806984a0b355f 100644
--- a/components/sync/engine/sync_scheduler_impl.cc
+++ b/components/sync/engine/sync_scheduler_impl.cc
@@ -511,6 +511,7 @@ void SyncSchedulerImpl::HandleFailure(
@@ -508,6 +508,7 @@ void SyncSchedulerImpl::HandleFailure(
SDVLOG(2) << "Sync cycle failed. Will back off for "
<< wait_interval_->length.InMilliseconds() << "ms.";
}
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 de7247787a37f76450f1e88d8f270e39be8f23e6..084fad14da6425e8e2095a2ab56922f6643ac225 100644
index 09c680f25e8e557e16d1ec16f820242c5495feee..b0da9f3496f5e4f197d88edecc9e356e2e28041c 100644
--- a/components/sync/protocol/proto_visitors.h
+++ b/components/sync/protocol/proto_visitors.h
@@ -471,6 +471,7 @@ VISIT_PROTO_FIELDS(const sync_pb::DeviceInfoSpecifics& proto) {
patches/components-update_client-BUILD.gn.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/components/update_client/BUILD.gn b/components/update_client/BUILD.gn
index c47a8e6ae8f5f713a5887dbe1b3b01aeba8c4175..a3d40019954836a6edd99d22c8519eb13b627087 100644
index a904b265e18001ca82b516e147930cceb6cd88a7..607ce02e5e5e960342337d939998fe5f25c86420 100644
--- a/components/update_client/BUILD.gn
+++ b/components/update_client/BUILD.gn
@@ -188,6 +188,8 @@ static_library("update_client") {
@@ -193,6 +193,8 @@ static_library("update_client") {
"puffin_patcher.h",
]
}
patches/content-browser-browser_main_loop.h.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/content/browser/browser_main_loop.h b/content/browser/browser_main_loop.h
index b2660cdc5e5d7a15ec22ae277270fe012428da7d..9c5769009e3866ef49249df855cfec6d8921bebd 100644
index dcdd22f1bbc30aa0e59a42288cd77fdc07c1973e..bd1c7bab76c6120716a732648d79a4f20a892257 100644
--- a/content/browser/browser_main_loop.h
+++ b/content/browser/browser_main_loop.h
@@ -158,6 +158,7 @@ class CONTENT_EXPORT BrowserMainLoop {
@@ -159,6 +159,7 @@ class CONTENT_EXPORT BrowserMainLoop {
void RunMainMessageLoop();
// Performs the pre-shutdown steps.
patches/content-browser-renderer_host-navigation_controller_impl.cc.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/content/browser/renderer_host/navigation_controller_impl.cc b/content/browser/renderer_host/navigation_controller_impl.cc
index 978ceb27e81b4412da27823ba9e72548e8530bde..52c2a80af1a76029d1f48a7d604b251a3d03d969 100644
index c8bf39eb21a3a74581314c8efd12d46ab9937837..1359104c6d315c3411c2e9bbcbd9fcc391fc8365 100644
--- a/content/browser/renderer_host/navigation_controller_impl.cc
+++ b/content/browser/renderer_host/navigation_controller_impl.cc
@@ -3559,16 +3559,17 @@ base::WeakPtr<NavigationHandle> NavigationControllerImpl::NavigateWithoutEntry(
@@ -3528,16 +3528,17 @@ base::WeakPtr<NavigationHandle> NavigationControllerImpl::NavigateWithoutEntry(
// Note: we intentionally leave the pending entry in place for renderer debug
// URLs, unlike the cases below where we clear it if the navigation doesn't
// proceed.
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 636902299141f4731f199966b446ffcc1b59ea5e..066b7d803ffbbc2292ef67ace7db8ef13e8b8124 100644
index 516a34f919823b5cff8beb92c2c25b9f4ba69ffc..eb9d0006cfdd2961a787ea67274feb8a2eccd454 100644
--- a/content/browser/renderer_host/navigation_request.cc
+++ b/content/browser/renderer_host/navigation_request.cc
@@ -2929,6 +2929,7 @@ void NavigationRequest::OnRequestRedirected(
@@ -2875,6 +2875,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 636902299141f4731f199966b446ffcc1b59ea5e..066b7d803ffbbc2292ef67ace7db8ef1
common_params_->referrer = Referrer::SanitizeForRequest(
common_params_->url, *common_params_->referrer);
@@ -4416,6 +4417,7 @@ void NavigationRequest::OnStartChecksComplete(
@@ -4362,6 +4363,7 @@ void NavigationRequest::OnStartChecksComplete(
headers.MergeFrom(TakeModifiedRequestHeaders());
begin_params_->headers = headers.ToString();
patches/content-common-BUILD.gn.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/content/common/BUILD.gn b/content/common/BUILD.gn
index 1b2023ffa408c4c644d96a4cd440367730738b78..669a73d833db57d539813d711dff31afdbaffef9 100644
index 32594910ef32e64dbd5d9fda1fe00b5da912a279..389379166cd767a3cf0afd6daf87012cc5f420f3 100644
--- a/content/common/BUILD.gn
+++ b/content/common/BUILD.gn
@@ -71,6 +71,7 @@ source_set("common") {
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 eba95453aacc6a9cd8a2a35213dde055fd2fbe25..ad292286872b97492533e835400059ba6927f5b5 100644
index 6f81847e1a0bf658bb49f8975bb52f165324da67..f195ccccb3e7530194ca14a222f265437a2ffef5 100644
--- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h
@@ -2053,6 +2053,7 @@ class CONTENT_EXPORT ContentBrowserClient {
@@ -2043,6 +2043,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 1829a86dc9c232de7d967be872af4a531a792894..0112d1cfcd8439706698709e5ed4f5cb82ea5e8b 100644
index adfb898a59d61e9a6f2b60fee6209f734cf0e038..4b3b3e0a9d980ebe15582de8f5619a891adae697 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -4416,6 +4416,7 @@ bool RenderFrameImpl::ShouldUseUserAgentOverride() const {
@@ -4420,6 +4420,7 @@ bool RenderFrameImpl::ShouldUseUserAgentOverride() const {
// Temporarily return early and fix properly as part of
// https://crbug.com/426555.
if (web_view->MainFrame()->IsWebRemoteFrame())
patches/content-renderer-render_thread_impl.cc.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index 284e0a362a289950c985e4f860b1d1cad8ef49b4..e1f96d785d2253fed3d6e93e83441b60b4d21a5f 100644
index 3255d4a681e8c97029da3c15b7144078c8849059..3e0515cfc2ee9d614af29991323ebdaadcf464ea 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -935,6 +935,7 @@ void RenderThreadImpl::InitializeRenderer(
@@ -937,6 +937,7 @@ void RenderThreadImpl::InitializeRenderer(
}
void RenderThreadImpl::RegisterSchemes() {
patches/extensions-renderer-native_extension_bindings_system.h.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/extensions/renderer/native_extension_bindings_system.h b/extensions/renderer/native_extension_bindings_system.h
index 65240f2b6c597bbb20fe6c260d45ff2b99d58961..8f3e0ed3bff0dd840643ee9078d341839b14e11d 100644
index b0cb48530c0f4147dfd9021612a1a4e9b91bbc17..8864a75bde791284720cf4b473368c659e555d52 100644
--- a/extensions/renderer/native_extension_bindings_system.h
+++ b/extensions/renderer/native_extension_bindings_system.h
@@ -41,6 +41,7 @@ class NativeExtensionBindingsSystem {
patches/ios-chrome-browser-prefs-browser_prefs.mm.patch
+4 -4
View File
@@ -1,8 +1,8 @@
diff --git a/ios/chrome/browser/prefs/browser_prefs.mm b/ios/chrome/browser/prefs/browser_prefs.mm
index bb087266b80c80aa377ec8a2eb85f5edcad79cb4..25c877d436c80d60e9979c2d6633a73fbd8fd468 100644
index 127a063b29fe66fcb9675a5dd1e83cc3d610c739..352749ce2856cc0d6d8aa3581ec0387b689108a6 100644
--- a/ios/chrome/browser/prefs/browser_prefs.mm
+++ b/ios/chrome/browser/prefs/browser_prefs.mm
@@ -198,6 +198,7 @@ void RegisterLocalStatePrefs(PrefRegistrySimple* registry) {
@@ -199,6 +199,7 @@ void RegisterLocalStatePrefs(PrefRegistrySimple* registry) {
// times a user should see autofill branding animation after installation.
registry->RegisterIntegerPref(
prefs::kAutofillBrandingIconAnimationRemainingCountPrefName, 2);
@@ -10,7 +10,7 @@ index bb087266b80c80aa377ec8a2eb85f5edcad79cb4..25c877d436c80d60e9979c2d6633a73f
}
void RegisterBrowserStatePrefs(user_prefs::PrefRegistrySyncable* registry) {
@@ -328,6 +329,7 @@ void RegisterBrowserStatePrefs(user_prefs::PrefRegistrySyncable* registry) {
@@ -329,6 +330,7 @@ void RegisterBrowserStatePrefs(user_prefs::PrefRegistrySyncable* registry) {
base::to_underlying(
prerender_prefs::NetworkPredictionSetting::kEnabledWifiOnly),
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
@@ -18,7 +18,7 @@ index bb087266b80c80aa377ec8a2eb85f5edcad79cb4..25c877d436c80d60e9979c2d6633a73f
}
// This method should be periodically pruned of year+ old migrations.
@@ -387,4 +389,5 @@ void MigrateObsoleteBrowserStatePrefs(PrefService* prefs) {
@@ -388,4 +390,5 @@ void MigrateObsoleteBrowserStatePrefs(PrefService* prefs) {
if (!account_id.empty())
prefs->SetString(prefs::kGoogleServicesLastGaiaId, account_id);
}
patches/net-BUILD.gn.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/net/BUILD.gn b/net/BUILD.gn
index 1b1e66cb263e73fc2e3a981b2e77da918b04c3a0..9d3cbeda6e60a2346092a8571e66840851345018 100644
index 6612d5483bd54214ec4cf8e4a6a7816192795ce8..bf06c3f001ca2fc0d64ee46266809092e0f5088a 100644
--- a/net/BUILD.gn
+++ b/net/BUILD.gn
@@ -1129,6 +1129,7 @@ component("net") {
@@ -1131,6 +1131,7 @@ component("net") {
"reporting/reporting_uploader.h",
]
}
patches/net-cookies-canonical_cookie.cc.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/net/cookies/canonical_cookie.cc b/net/cookies/canonical_cookie.cc
index 792cc00f27e98cdb456ff7d519c3940d0acc028f..bf84e0af29ef7eab555f8037a368a280c1cee58c 100644
index 92174b661b6aae117368fbc3d667d6089e59f73d..605e3867fea619c43ee5f05f367e4c1a8e858b92 100644
--- a/net/cookies/canonical_cookie.cc
+++ b/net/cookies/canonical_cookie.cc
@@ -516,6 +516,7 @@ base::Time CanonicalCookie::ValidateAndAdjustExpiryDate(
patches/net-dns-host_cache.cc.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/net/dns/host_cache.cc b/net/dns/host_cache.cc
index c1448788a90ece692444aa8f6083c407c6169461..b498d14d0a171d43e06159637d79a4506f976a97 100644
index c3aaf7d8dbdae986c743a52c6a10686d277519b9..80982951635f10fdd4a02eaa20039c32ab458f96 100644
--- a/net/dns/host_cache.cc
+++ b/net/dns/host_cache.cc
@@ -516,6 +516,7 @@ HostCache::Entry HostCache::Entry::CopyWithDefaultPort(uint16_t port) const {
patches/net-proxy_resolution-configured_proxy_resolution_service.cc.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/net/proxy_resolution/configured_proxy_resolution_service.cc b/net/proxy_resolution/configured_proxy_resolution_service.cc
index bcdc90d8bb63fd9f3e95d27cc10fc4677083b707..78af4ec22bfc030ae4c671b0c84ed32b5b0c459b 100644
index 45a5e755fe1d6472ed5114180e684e4763460512..8c8917ee7b9203a46eac208eaa2d028ec03ab441 100644
--- a/net/proxy_resolution/configured_proxy_resolution_service.cc
+++ b/net/proxy_resolution/configured_proxy_resolution_service.cc
@@ -976,6 +976,7 @@ int ConfiguredProxyResolutionService::TryToCompleteSynchronously(
patches/net-socket-socks5_client_socket.h.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/net/socket/socks5_client_socket.h b/net/socket/socks5_client_socket.h
index f6cfbe45c3613c11ffce22d6bacf626cf967e1dd..959f95d96b6749164d0cf785524fd6657609607f 100644
index aaef276a3d5a4b6731393cba1cf42ee5ae15e13b..2901a34c01c97af9cd5e2d821f381e419697057a 100644
--- a/net/socket/socks5_client_socket.h
+++ b/net/socket/socks5_client_socket.h
@@ -76,11 +76,14 @@ class NET_EXPORT_PRIVATE SOCKS5ClientSocket : public StreamSocket {
patches/services-network-cookie_manager.cc.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/services/network/cookie_manager.cc b/services/network/cookie_manager.cc
index ac4d26f0bcc4b9a6f406445c927832cc52ee846b..a7cfbdeb8e6a93aefe4b7dcb1f29792d00db8d54 100644
index 9da2056ddd3cff1c3b5ece77e9654bef1d2a40f1..b0314a9a5825f2e4d4b9dad5cb4d4fc2a7ff0b40 100644
--- a/services/network/cookie_manager.cc
+++ b/services/network/cookie_manager.cc
@@ -350,6 +350,7 @@ CookieDeletionInfo DeletionFilterToInfo(mojom::CookieDeletionFilterPtr filter) {
patches/third_party-blink-renderer-bindings-generated_in_modules.gni.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/third_party/blink/renderer/bindings/generated_in_modules.gni b/third_party/blink/renderer/bindings/generated_in_modules.gni
index d5f40bbe5391b7080d0ae1a29dd9c6b7082f644d..8fe593c39f3bf378109a4797de38f92af4e9a7d5 100644
index af3569844feff8d947d4deeb95ca9f3abdddc881..fbffb351e8fc33c7e58c77e397eeba86e6c752e0 100644
--- a/third_party/blink/renderer/bindings/generated_in_modules.gni
+++ b/third_party/blink/renderer/bindings/generated_in_modules.gni
@@ -2604,6 +2604,7 @@ generated_interface_sources_in_modules = [
@@ -2600,6 +2600,7 @@ generated_interface_sources_in_modules = [
"$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_webgl_layer.cc",
"$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_webgl_layer.h",
]
patches/third_party-blink-renderer-bindings-idl_in_modules.gni.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/third_party/blink/renderer/bindings/idl_in_modules.gni b/third_party/blink/renderer/bindings/idl_in_modules.gni
index ce2a17e1a6f3a9d6a586b0db71108d728e5648a7..b8ff907e9a10447e43b886f630b7cff69f7a0182 100644
index b67a0a6ef165741c833a8e1101fbc0a64f9adbb7..18bcd079972e2a972bc8822df4f2538e9e9add03 100644
--- a/third_party/blink/renderer/bindings/idl_in_modules.gni
+++ b/third_party/blink/renderer/bindings/idl_in_modules.gni
@@ -1175,6 +1175,7 @@ static_idl_files_in_modules = get_path_info(
@@ -1174,6 +1174,7 @@ static_idl_files_in_modules = get_path_info(
"//third_party/blink/renderer/modules/xr/xr_webgl_layer_init.idl",
],
"abspath")
patches/third_party-blink-renderer-bindings-scripts-bind_gen-interface.py.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py b/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py
index 865e55aa0342dc9414c71935b10bbd52b86c009b..5bb088cd93ad5f1823af0fc26aee1ddaa14a808b 100644
index 221ca153fe822b7b658e6db82f3c61e8d36ce7a8..2f9cd0ff799ca24bc656379169e56b4b61c85648 100644
--- a/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py
+++ b/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py
@@ -8144,3 +8144,4 @@ def generate_interfaces(task_queue):
@@ -8141,3 +8141,4 @@ def generate_interfaces(task_queue):
"InitIDLInterfacesForTesting",
"init_idl_interfaces_for_testing",
for_testing=True)
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 a42b76b65e9b04f5226c5e4e706fae45464a96b0..583f20dde73140b6e0204f5cc473f26894bbc9af 100644
index 5010d186f6b0d3d7eb0db089d3391f4ccc3b94cd..2f057d5b97dbbff06c660911e8b89e41452487b9 100644
--- a/third_party/blink/renderer/core/BUILD.gn
+++ b/third_party/blink/renderer/core/BUILD.gn
@@ -370,6 +370,7 @@ component("core") {
@@ -371,6 +371,7 @@ component("core") {
"Carbon.framework",
]
}
patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.cc.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc b/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc
index 252a6e0954380c02d3ccd10ccdae629a6fd6d81c..1010b28f2aa7c90a15df5360f2c2e86a234b0888 100644
index e0ca9bc552df641dd8cd4ff5d304a8f4d5d3f30a..aea7b1613a70293f8c4ade83427462137cfb3233 100644
--- a/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc
+++ b/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc
@@ -1065,6 +1065,7 @@ String HTMLCanvasElement::ToDataURLInternal(
@@ -1076,6 +1076,7 @@ String HTMLCanvasElement::ToDataURLInternal(
if (!data_buffer)
return String("data:,");
patches/third_party-blink-renderer-modules-BUILD.gn.patch
+3 -3
View File
@@ -1,8 +1,8 @@
diff --git a/third_party/blink/renderer/modules/BUILD.gn b/third_party/blink/renderer/modules/BUILD.gn
index fb02e6201deef3bcea19eda7b9c53298d8fcce23..0e1fd9e2bd33d438c2e0688e188f23a8d0ecfe68 100644
index 907091555bfbb8be8b3163b2bfe337a37e590feb..ce8416bca8061eb13c42f05e69b0419aec371eec 100644
--- a/third_party/blink/renderer/modules/BUILD.gn
+++ b/third_party/blink/renderer/modules/BUILD.gn
@@ -15,6 +15,7 @@ if (is_android) {
@@ -16,6 +16,7 @@ if (is_android) {
}
visibility = [ "//third_party/blink/renderer/*" ]
@@ -10,7 +10,7 @@ index fb02e6201deef3bcea19eda7b9c53298d8fcce23..0e1fd9e2bd33d438c2e0688e188f23a8
config("modules_implementation") {
defines = [ "BLINK_MODULES_IMPLEMENTATION=1" ]
@@ -171,6 +172,7 @@ component("modules") {
@@ -172,6 +173,7 @@ component("modules") {
# generating the snapshot for android, blink is compiled with
# current_os="linux" and target_os="android". Using target_os is necessary as
# we need to compile in the same way as would happen when current_os="android".
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 e8fb2dea9ab01a16fd65ddb44a5812aba459e63e..cb0f9edd442f3f499bd567192588312a83f53069 100644
index 533207adc4060f8e5633a789966d2307e0994453..7f63eeeca1b1395f7571f402ce1674fa05cc96ad 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
@@ -1944,6 +1944,7 @@ ImageData* BaseRenderingContext2D::getImageData(
@@ -1943,6 +1943,7 @@ ImageData* BaseRenderingContext2D::getImageData(
}
ImageData* BaseRenderingContext2D::getImageDataInternal(
@@ -10,7 +10,7 @@ index e8fb2dea9ab01a16fd65ddb44a5812aba459e63e..cb0f9edd442f3f499bd567192588312a
int sx,
int sy,
int sw,
@@ -2081,6 +2082,7 @@ ImageData* BaseRenderingContext2D::getImageDataInternal(
@@ -2080,6 +2081,7 @@ ImageData* BaseRenderingContext2D::getImageDataInternal(
DCHECK(!bounds.intersect(SkIRect::MakeXYWH(sx, sy, sw, sh)));
}
}
patches/third_party/catapult/tracing-tracing-metrics-system_health-loading_metric.html.patch
Vendored
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/tracing/tracing/metrics/system_health/loading_metric.html b/tracing/tracing/metrics/system_health/loading_metric.html
index 2c5ab4b2d038cafca4201c8445cfe677c93c24c4..d3618406df4c181a92cab73ba4388b0ce9d88923 100644
index f20338b5b9f7b99b4404717cf661144ca0b3480f..456074bb88700162a8d753334764d7fea38c3153 100644
--- a/tracing/tracing/metrics/system_health/loading_metric.html
+++ b/tracing/tracing/metrics/system_health/loading_metric.html
@@ -744,6 +744,7 @@ tr.exportTo('tr.metrics.sh', function() {
@@ -751,6 +751,7 @@ tr.exportTo('tr.metrics.sh', function() {
for (const pid in chromeHelper.rendererHelpers) {
const rendererHelper = chromeHelper.rendererHelpers[pid];
if (rendererHelper.isChromeTracingUI) continue;
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 813e6d1de08016b31ae14781d783f67c5808be2e..67eb9d1b442dd7bdf5df78c9e4d2ce790d86e864 100644
index 79c181d67e4157484e0a6a78dccf46ec28602bcb..ff63c1950e0d004bce687f6151da4ffffa5221c0 100644
--- a/tools/metrics/histograms/metadata/histogram_suffixes_list.xml
+++ b/tools/metrics/histograms/metadata/histogram_suffixes_list.xml
@@ -7207,6 +7207,7 @@ chromium-metrics-reviews@google.com.
@@ -7206,6 +7206,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-perf-process_perf_results.py.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/tools/perf/process_perf_results.py b/tools/perf/process_perf_results.py
index f06aba78d66f7dcb2e4949b0a83f1f03cc470567..22681c4551124bebaf8d0c49c97b7860b1d4db97 100755
index 3a34aa877d06d463069605909c70798ff1d14581..07798ced5cc23ab22b726ded59f009855e496123 100755
--- a/tools/perf/process_perf_results.py
+++ b/tools/perf/process_perf_results.py
@@ -41,7 +41,7 @@ except ImportError:
patches/ui-accessibility-platform-ax_platform_node_cocoa.mm.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/ui/accessibility/platform/ax_platform_node_cocoa.mm b/ui/accessibility/platform/ax_platform_node_cocoa.mm
index ebdfe410f44540b97733965192d69aae2065bba1..f0cd655793228da708af568511835e7cdd780819 100644
index 491e45ea6ca181f640144387cd94cdeedc7a2321..534910e7092cc3ae056cd22b8e8f914f4dd0aad0 100644
--- a/ui/accessibility/platform/ax_platform_node_cocoa.mm
+++ b/ui/accessibility/platform/ax_platform_node_cocoa.mm
@@ -2238,6 +2238,7 @@ bool IsAXSetter(SEL selector) {
@@ -2213,6 +2213,7 @@ bool IsAXSetter(SEL selector) {
if (!_node)
return nil;
patches/ui-webui-resources-BUILD.gn.patch
+2 -2
View File
@@ -1,5 +1,5 @@
diff --git a/ui/webui/resources/BUILD.gn b/ui/webui/resources/BUILD.gn
index 85b1406103cc3ba506b6b6317f6ba3c3f7c6b607..7687c8e416ecf7b54a01aad18ef2504499539bfe 100644
index 8596202008f47e951ba2ee4b3ffdc41a5357f835..cf97c09d0ae7259dd577a385764fa465c3ca75e4 100644
--- a/ui/webui/resources/BUILD.gn
+++ b/ui/webui/resources/BUILD.gn
@@ -105,6 +105,7 @@ generate_grd("build_grd") {
@@ -10,7 +10,7 @@ index 85b1406103cc3ba506b6b6317f6ba3c3f7c6b607..7687c8e416ecf7b54a01aad18ef25044
}
if (is_chromeos_ash) {
@@ -232,6 +233,7 @@ ts_library("library") {
@@ -235,6 +236,7 @@ ts_library("library") {
":generate_definitions",
":preprocess",
]
patches/v8/BUILD.gn.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/BUILD.gn b/BUILD.gn
index fd8ba56a01fd1c0ebbc6d92fcadab084ccf87a56..97122330718839cfa8941a4e56c692cd49881656 100644
index 0063c600b4dd70abdfeaeff7ba35f5bc70582ba0..d534352082c5b6608987cfac4eb25864c979b69e 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -621,6 +621,7 @@ config("internal_config_base") {
patches/v8/src-codegen-compiler.cc.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/src/codegen/compiler.cc b/src/codegen/compiler.cc
index 6efa1f3558f8a29ad4d6489e76a10000425044f7..b379048312ed9112bdd8f46d609142e876a532cb 100644
index 9e7d2394fba06483f9fad30d440daf0abce876aa..c427b6d6b32dccc7ecfe7c054c426ea7ae657359 100644
--- a/src/codegen/compiler.cc
+++ b/src/codegen/compiler.cc
@@ -2893,6 +2893,7 @@ MaybeHandle<JSFunction> Compiler::GetFunctionFromEval(
@@ -2887,6 +2887,7 @@ MaybeHandle<JSFunction> Compiler::GetFunctionFromEval(
}
}
DCHECK(is_compiled_scope.is_compiled());