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

Updated patches from Chromium 109.0.5410.0 to Chromium 109.0.5414.8.

Browse Source
This commit is contained in:
Claudio DeSouza
2022-12-15 14:18:50 -05:00
committed by Max Karolinskiy
parent 1fb8eaf199
commit 62274e5bdd
50 changed files with 108 additions and 108 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 54d848855461647c0f890202e7e0bed7bf19da3e..b224b673007f10765df36498d93b73c75f4ca823 100644
index 9f8def5db6e6b22dfe3f778b9b2b87e35e740fb6..c07c9ee374ec1121e987e30f0f6ce28db3722d40 100644
--- a/PRESUBMIT.py
+++ b/PRESUBMIT.py
@@ -6689,3 +6689,4 @@ def CheckNoJsInIos(input_api, output_api):
@@ -6701,3 +6701,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 92f38639628933381c0218f41a0a506a03c60383..0075ab340d749dd8fcc6d85673fe520308ca2566 100644
index 304a8d1891a9896fa770c1b90503aeb7fe972dd0..6db56ec0e693d61286e5c93ec632bfbaaa478b34 100644
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
@@ -4348,6 +4348,7 @@ if (is_android) {
@@ -4368,6 +4368,7 @@ if (is_android) {
"android/java/src/org/chromium/base/task/TaskTraits.java",
"android/java/src/org/chromium/base/task/TaskTraitsExtensionDescriptor.java",
]
patches/chrome-android-BUILD.gn.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
index cef15d8e51d19306c0da91e21f46209095a4067a..d6a4e2ae202b8951e1c5611907d1645e7da2057f 100644
index bbe60579da25189c2a24c84add07ad489cc9198b..f86cae00906618a0c18b1b5f3aa455695202ac81 100644
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -243,6 +243,7 @@ if (current_toolchain == default_toolchain) {
patches/chrome-android-chrome_java_sources.gni.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
index 559b390c879a2e209c151d7df95e9d3a41257688..0d2c73a37b86cc633ddcf482c4682ad23e58821c 100644
index d5d94f9eb6fc821a371cc83691affd06105fe189..806d7c39387b9be98bf5de78c92e6f4fd2e3f6ac 100644
--- a/chrome/android/chrome_java_sources.gni
+++ b/chrome/android/chrome_java_sources.gni
@@ -1226,3 +1226,4 @@ chrome_java_sources = [
@@ -1223,3 +1223,4 @@ chrome_java_sources = [
"java/src/org/chromium/chrome/browser/webauth/authenticator/CableAuthenticatorUSBActivity.java",
"java/src/org/chromium/chrome/browser/webshare/ShareServiceImplementationFactory.java",
]
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 9ef9590689e5ccae36ee7cb8be4f15947243c5d7..67d92fce1354046205ff7fcad81bba5fbf9ee682 100644
index 579d2c1b3db0685994994d3f1b941ab0f9922743..e26731d3e2a2d4397fcc44a7482881329ba4c6ed 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -2533,6 +2533,7 @@ static_library("browser") {
@@ -2535,6 +2535,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 3d5051b18bf3080b2401cce3bc5f2e7122101417..bb66c05a996a9b59cf8ab964afc812d87b465af7 100644
index 9e239a5d8f83c7cfd3e885b5ff99e6121b337e7c..0d7976f178f7016320c0d34ea2571025b3732567 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -3626,6 +3626,7 @@ const FeatureEntry::FeatureVariation kFastCheckoutVariations[] = {
@@ -3627,6 +3627,7 @@ const FeatureEntry::FeatureVariation kFastCheckoutVariations[] = {
//
// When adding a new choice, add it to the end of the list.
const FeatureEntry kFeatureEntries[] = {
patches/chrome-browser-extensions-BUILD.gn.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUILD.gn
index a0e3409c4a782d80a567d937c455b7f67f8bfafd..99e5ebfe64158f195797415ead8c451e21279f7c 100644
index 49ce3d94f576e468a8f6dff6d3b2decd8a24bea5..82397e878d6adc870cab3492b2ff13a91fb85a35 100644
--- a/chrome/browser/extensions/BUILD.gn
+++ b/chrome/browser/extensions/BUILD.gn
@@ -1370,6 +1370,7 @@ static_library("extensions") {
patches/chrome-browser-ui-BUILD.gn.patch
+2 -2
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
index b165f29782918694184fa98ba5b0916ac2e50ac4..8c78b73184fe8abec8319f1de15d4821f5412931 100644
index 57133a0b9c92a6080bce58578918ad07ed94b6fb..693766377cb9927425d42b2879f924addde0d849 100644
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -668,6 +668,7 @@ static_library("ui") {
@@ -10,7 +10,7 @@ index b165f29782918694184fa98ba5b0916ac2e50ac4..8c78b73184fe8abec8319f1de15d4821
# TODO(crbug/925153): Remove this circular dependency.
allow_circular_includes_from = [
@@ -4007,10 +4008,13 @@ static_library("ui") {
@@ -4001,10 +4002,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
+2 -2
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 bec30f3f22ad9c4f53c05f369af244bd0fdd28a9..f934eff0c5569a7199d031be102123f70de8b974 100644
index 8ab54850b7a1df697ae97efc3a77106fc526e552..22ef04543aade0d9821734fb9763365631f2f4a4 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
@@ -34,7 +34,7 @@ index bec30f3f22ad9c4f53c05f369af244bd0fdd28a9..f934eff0c5569a7199d031be102123f7
// Draw the tab stack button and associated text if necessary.
if (mTabSwitcherAnimationTabStackDrawable != null && mToggleTabStackButton != null
&& mUrlExpansionFraction != 1f) {
@@ -2053,6 +2057,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC
@@ -2054,6 +2058,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC
} else {
populateUrlClearExpansionAnimatorSet(animators);
}
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 7eca80fed385c81b22031d181ee2c01961f81d28..5fcf6969a108bfe4722086643689fc87742bc8ae 100644
index f0789647f62c8cfa8bef0eff8dd1a8a25cdf3af3..a7539749c37abd8bb2b0ac4f3fd8a26ddc793446 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-startup-startup_browser_creator_impl.cc.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/ui/startup/startup_browser_creator_impl.cc b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
index f29de3d442ad28c2bec5a68e92434bcc1a907e20..4b7f4dfa522cc0c385b4b04448366f819a347687 100644
index 8cae23dbdf22fd75e675df444eef31012276b19d..1d9f1e35f2e346c1e35a70fba0ae493e15e9e4b2 100644
--- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
@@ -397,6 +397,7 @@ StartupBrowserCreatorImpl::DetermineURLsAndLaunch(
@@ -398,6 +398,7 @@ StartupBrowserCreatorImpl::DetermineURLsAndLaunch(
#elif !BUILDFLAG(IS_CHROMEOS_ASH)
welcome_enabled =
welcome::IsEnabled(profile_) && welcome::HasModulesToShow(profile_);
patches/chrome-browser-ui-views-bookmarks-bookmark_bar_view.cc.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
index 529e69cc5d1ca3923bbf526b75b92e71be68430b..9859ef2809495f56d89c552b3b7c0b29cf65a110 100644
index 224bd1a4d300a7116ecf1e319235b5bf25882edd..d06b87a4531880d6736072d3e603f96e54d20aae 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
@@ -855,6 +855,7 @@ void BookmarkBarView::Layout() {
@@ -856,6 +856,7 @@ void BookmarkBarView::Layout() {
x = next_x;
}
}
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 2c480c4815b1c3ad463675e6a812c98d9479670c..62d8eefeafca9e5f3650abb92ebca2b1f4020ad0 100644
index 9bf773fc5b447938986a53c5f22f3bc7bbd9f83c..a326b5c50332996ce42060b2d252497ff4ea26f4 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
@@ -526,6 +526,7 @@ gfx::Size PageInfoMainView::CalculatePreferredSize() const {
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 8b4755388baee1ee83b78fd01a6116b090069fe1..af7f343aa4ea07a92e2e63c7fb98cf4ad9ded088 100644
index 98a6cdc0962ba6f4063228c7e065b56b72e1405f..5da2d21d8d0ef2c9ca69209186e5a4ecfe826236 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-views-profiles-avatar_toolbar_button.h.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/ui/views/profiles/avatar_toolbar_button.h b/chrome/browser/ui/views/profiles/avatar_toolbar_button.h
index 74c5c352ead58260dd95f1726cf3e1c87fc65d77..5caed1b9d5a441a6b135e2dac183a390a57ac35e 100644
index 21960bf045e9bd70a99252f6bf27c087d1be5f46..b3e915589e0a60327db08fe1e6fe91d1f60b85d4 100644
--- a/chrome/browser/ui/views/profiles/avatar_toolbar_button.h
+++ b/chrome/browser/ui/views/profiles/avatar_toolbar_button.h
@@ -78,6 +78,7 @@ class AvatarToolbarButton : public ToolbarButton,
@@ -67,6 +67,7 @@ class AvatarToolbarButton : public ToolbarButton {
static void SetIPHMinDelayAfterCreationForTesting(base::TimeDelta delay);
private:
patches/chrome-browser-ui-webui-BUILD.gn.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/ui/webui/BUILD.gn b/chrome/browser/ui/webui/BUILD.gn
index df056bb15653eafb6012fe852e221be6ebb89511..fa2b20cacb24dc7c6bdee432825e796311783684 100644
index 44228b02c933822705d0076edd73ebf9e7984813..929a84f603344c8cd1de24abd29f90ad2f6dba2b 100644
--- a/chrome/browser/ui/webui/BUILD.gn
+++ b/chrome/browser/ui/webui/BUILD.gn
@@ -67,4 +67,5 @@ source_set("configs") {
@@ -69,4 +69,5 @@ source_set("configs") {
deps += [ "//ash/webui/sample_system_web_app_ui" ]
}
}
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 68058df5b08894a7a0f4ddd2bf2d58631fbf3a2b..dc86b799df42330b459b842854cde91645d90a95 100644
index 2cf9f47ce495c6737366585b11087861c20563b2..028b24185ea3e42584aa3e75c495856b98996c47 100644
--- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
+++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
@@ -1388,6 +1388,7 @@ void ChromeWebUIControllerFactory::GetFaviconForURL(
@@ -1334,6 +1334,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 23d27bb2c78bfa657b766a4685f539928702b0a2..3b2c7d29a1bdbab4bd04cba264d54905b4ba141f 100644
index c7e9d096a2bf8fefc5cc4a59208838a76a84812b..dbed07be38a069cfac1d44c1cf1e2033a9b242d5 100644
--- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
+++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
@@ -3220,6 +3220,7 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source,
@@ -3221,6 +3221,7 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source,
policy_indicator::AddLocalizedStrings(html_source);
AddSecurityKeysStrings(html_source);
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 5a44d2603fc9097510799870b14666ce6f092a52..802cdd3b3522266e70a8c5aa8a740145273cfafa 100644
index be4a273060d49468867dde5bb91b63f50e694e02..5ba4eaa2ec370c3dbdccab2713ae194a6df0f1a4 100644
--- a/chrome/common/BUILD.gn
+++ b/chrome/common/BUILD.gn
@@ -89,6 +89,7 @@ source_set("channel_info") {
patches/chrome-installer-mac-signing-parts.py.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/installer/mac/signing/parts.py b/chrome/installer/mac/signing/parts.py
index 6bb9dcbedfc3ccd29bcaf89fb0070b8f6cbc146d..a1b6060bdb764ee76d51df5ca5ac9a51f6656d81 100644
index 919bd110c5af3a217fde6aa4a5a675566c764a8f..f185f361f7e9e3ddf3a5f5d98c00c9cf718fdf29 100644
--- a/chrome/installer/mac/signing/parts.py
+++ b/chrome/installer/mac/signing/parts.py
@@ -10,6 +10,7 @@ import os.path
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 a412da77724798f4391f83f02b713cf2be546ed5..22f5ec643368ec96e4d860d3de7d0b183c73015a 100644
index 763cf51e6e44260af9875a47b89e2b7246d2960d..d66cd3b8290286241c0c55b2f9f0a27948adcca3 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -321,6 +321,7 @@ static_library("test_support") {
@@ -322,6 +322,7 @@ static_library("test_support") {
"//ui/gl",
]
@@ -10,7 +10,7 @@ index a412da77724798f4391f83f02b713cf2be546ed5..22f5ec643368ec96e4d860d3de7d0b18
data_deps = []
if (enable_pdf) {
@@ -5226,7 +5227,7 @@ config("disable_thinlto_cache_flags") {
@@ -5227,7 +5228,7 @@ config("disable_thinlto_cache_flags") {
}
config("pdb_larger_than_4gb") {
patches/chrome-tools-build-win-create_installer_archive.py.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/tools/build/win/create_installer_archive.py b/chrome/tools/build/win/create_installer_archive.py
index 349d09418308d39c580c75bcbd552b49f474143d..50138c90a3fc2bea57e20043e0683bf6e9295782 100755
index 795992c863c9ca35b8393980a1166e139da890b5..5eda7318178a5f54d9bda88b555eb45289914b6d 100755
--- a/chrome/tools/build/win/create_installer_archive.py
+++ b/chrome/tools/build/win/create_installer_archive.py
@@ -42,6 +42,8 @@ SETUP_PATCH_FILE_PREFIX = "setup_patch"
patches/components-content_settings-core-browser-content_settings_pref.cc.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/components/content_settings/core/browser/content_settings_pref.cc b/components/content_settings/core/browser/content_settings_pref.cc
index ad1e7296ed8dcbec109f08a1ccbb3d231f15736e..2059e66ce98f458805bb59608169d12e57602b6d 100644
index bcb3e1f917e2c69f64bcdc5b52fb405b3f421e0c..bca21d9cbd8a9367d25c858dea847fea92f90488 100644
--- a/components/content_settings/core/browser/content_settings_pref.cc
+++ b/components/content_settings/core/browser/content_settings_pref.cc
@@ -157,6 +157,7 @@ void ContentSettingsPref::SetWebsiteSetting(
patches/components-omnibox-browser-BUILD.gn.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/components/omnibox/browser/BUILD.gn b/components/omnibox/browser/BUILD.gn
index 915d6a27df355da7235c07994611eef7315a83d7..1eede5c8105f6afa39560b05694432ca112ef06f 100644
index 114217b5c033baf565f7fe63068ffd770be125f7..f84016696a613ed626fcbb023e6572b67fd9e71a 100644
--- a/components/omnibox/browser/BUILD.gn
+++ b/components/omnibox/browser/BUILD.gn
@@ -295,6 +295,7 @@ static_library("browser") {
@@ -299,6 +299,7 @@ static_library("browser") {
"//ui/base",
"//ui/gfx",
]
patches/components-page_info-page_info.cc.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/components/page_info/page_info.cc b/components/page_info/page_info.cc
index dd4979715a8ef4b301caaf14b2e97d6682dc818a..058077a2caa917bab45c9f0e2ef332cf9a79d086 100644
index cb9befd20c02ec9e0a1f4283714cf438b4abed0f..2b1a33f886ad0aa2418675269cabd06a12c7a161 100644
--- a/components/page_info/page_info.cc
+++ b/components/page_info/page_info.cc
@@ -1197,6 +1197,7 @@ void PageInfo::PresentSitePermissions() {
patches/components-variations-variations_seed_store.cc.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/components/variations/variations_seed_store.cc b/components/variations/variations_seed_store.cc
index f22789fcd0747dc783f8610a5aaa93c43fcec55b..4adcdbc9828dca37e75890237dc41890c11bcb51 100644
index d05b808c0cb19605ebb2b257f2cfb13509702ac5..4a64302f250fbfab34e81d2227a26acfd73d8fec 100644
--- a/components/variations/variations_seed_store.cc
+++ b/components/variations/variations_seed_store.cc
@@ -49,6 +49,7 @@ const base::FeatureParam<bool> kVariationsAsyncProcessing{
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 6b1059df4d4ca0db0d4939340d10577037636a50..c058e01257cd6a2f404cd7ddd11097872c1fd434 100644
index b94319b55f5f04acc3ac54b653b57d24409eb9fd..d85953e660836b34f979c04a179972d4eae527bf 100644
--- a/content/browser/renderer_host/navigation_controller_impl.cc
+++ b/content/browser/renderer_host/navigation_controller_impl.cc
@@ -3528,16 +3528,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 4ee72c3d84d7768503a02f6d43390d406486eb7f..e514341e622ec4acaad5a77565c06c6c7f57f584 100644
index cd1650e1e1ad05bf1c6aff8710b25ca3f8fe22a7..ea060cdff216046d5d944c04346fe1a7a6e964b4 100644
--- a/content/browser/renderer_host/navigation_request.cc
+++ b/content/browser/renderer_host/navigation_request.cc
@@ -2877,6 +2877,7 @@ void NavigationRequest::OnRequestRedirected(
@@ -2903,6 +2903,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 4ee72c3d84d7768503a02f6d43390d406486eb7f..e514341e622ec4acaad5a77565c06c6c
common_params_->referrer = Referrer::SanitizeForRequest(
common_params_->url, *common_params_->referrer);
@@ -4364,6 +4365,7 @@ void NavigationRequest::OnStartChecksComplete(
@@ -4389,6 +4390,7 @@ void NavigationRequest::OnStartChecksComplete(
headers.MergeFrom(TakeModifiedRequestHeaders());
begin_params_->headers = headers.ToString();
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 f80b2cfee123a89237b83d5b672e7ca08e24aae5..1362a162f21473d3e372fa35762f57b2947871ad 100644
index aee69f38859264537ab9326d4682999922afbc14..ae8e43bec161778adf9ed27069a940bf80c21e12 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -4426,6 +4426,7 @@ bool RenderFrameImpl::ShouldUseUserAgentOverride() const {
@@ -4427,6 +4427,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 3255d4a681e8c97029da3c15b7144078c8849059..3e0515cfc2ee9d614af29991323ebdaadcf464ea 100644
index 49688b3adc657686474a6a0c2393ea4d6f895d7e..1174e200c9a04212825e93c34718a95ad6575426 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -937,6 +937,7 @@ void RenderThreadImpl::InitializeRenderer(
@@ -936,6 +936,7 @@ void RenderThreadImpl::InitializeRenderer(
}
void RenderThreadImpl::RegisterSchemes() {
patches/extensions-common-api-_api_features.json.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/extensions/common/api/_api_features.json b/extensions/common/api/_api_features.json
index c4d10fb33b51e573837847cefb30b677fc44db10..a25964c69274cf650b29ce0ff1b44ac167c19615 100644
index ffe3b2bf7520c76e817f43a370178d1cc81344c5..b9f51eb07c92898c05181d19df0b70e47bf6a7a3 100644
--- a/extensions/common/api/_api_features.json
+++ b/extensions/common/api/_api_features.json
@@ -593,6 +593,7 @@
patches/extensions-common-api-_permission_features.json.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/extensions/common/api/_permission_features.json b/extensions/common/api/_permission_features.json
index f69bdd43d7c2f2be54df55514dff687fb6b63321..d6a88a53f9c87b9b70d9d2f811a15e4f74c99685 100644
index ac9d414bd3c2515934a7ec6a4711fbaa9e7156e5..40cc7e002a61c0045833a074719c60615ecdd1c0 100644
--- a/extensions/common/api/_permission_features.json
+++ b/extensions/common/api/_permission_features.json
@@ -314,6 +314,7 @@
patches/media-audio-pulse-pulse_util.cc.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/media/audio/pulse/pulse_util.cc b/media/audio/pulse/pulse_util.cc
index bc589ad691418f49ea742618de0a94b36ee43c8e..1a57cba5c62d55314215ccafb500a856d1785e60 100644
index 1ef136960b3a3b8771a4f0739c419352ea13ef7f..76d94e43110f0396c1a405dd200b9abd8460e0f7 100644
--- a/media/audio/pulse/pulse_util.cc
+++ b/media/audio/pulse/pulse_util.cc
@@ -37,7 +37,7 @@ namespace {
@@ -38,7 +38,7 @@ namespace {
#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
constexpr char kBrowserDisplayName[] = "google-chrome";
#define PRODUCT_STRING "Google Chrome"
patches/net-BUILD.gn.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/net/BUILD.gn b/net/BUILD.gn
index 1cca728386e9f7790ff88d30140c0aed02189b73..69bf8a4d8aa299ab96d71d3455940cc2e9a2540f 100644
index 40f143dd9ba73d4fa17f6fa512f2af7a7d6b5d1d..7f7a09d4b0dedb130390396c8337a836697a263e 100644
--- a/net/BUILD.gn
+++ b/net/BUILD.gn
@@ -1131,6 +1131,7 @@ component("net") {
patches/third_party-blink-renderer-bindings-generated_in_modules.gni.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/third_party/blink/renderer/bindings/generated_in_modules.gni b/third_party/blink/renderer/bindings/generated_in_modules.gni
index af3569844feff8d947d4deeb95ca9f3abdddc881..fbffb351e8fc33c7e58c77e397eeba86e6c752e0 100644
index db72e5edb2f0ae5df1553acae5b6bfb16b30dcfd..6d6301548235252380998f0b70528c6156874b72 100644
--- a/third_party/blink/renderer/bindings/generated_in_modules.gni
+++ b/third_party/blink/renderer/bindings/generated_in_modules.gni
@@ -2600,6 +2600,7 @@ generated_interface_sources_in_modules = [
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 b67a0a6ef165741c833a8e1101fbc0a64f9adbb7..18bcd079972e2a972bc8822df4f2538e9e9add03 100644
index fec4479cbc6398a2e1c348f22b98339ae38a31be..894e500220b141fd77b88d2f7eb63c4d3e1e08ce 100644
--- a/third_party/blink/renderer/bindings/idl_in_modules.gni
+++ b/third_party/blink/renderer/bindings/idl_in_modules.gni
@@ -1174,6 +1174,7 @@ static_idl_files_in_modules = get_path_info(
@@ -1173,6 +1173,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 221ca153fe822b7b658e6db82f3c61e8d36ce7a8..2f9cd0ff799ca24bc656379169e56b4b61c85648 100644
index 3ee794e8b17e77505c4cca82ec0a9accc73b9b91..e963bf3921d2de6f6ef6055cf1b17dcbc4c9f305 100644
--- a/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py
+++ b/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py
@@ -8141,3 +8141,4 @@ def generate_interfaces(task_queue):
@@ -8132,3 +8132,4 @@ def generate_interfaces(task_queue):
"InitIDLInterfacesForTesting",
"init_idl_interfaces_for_testing",
for_testing=True)
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 e0ca9bc552df641dd8cd4ff5d304a8f4d5d3f30a..aea7b1613a70293f8c4ade83427462137cfb3233 100644
index 7f95eb174be19aa13f8191b881cc8c9176e5197c..d0c5833e523dea756bfb6f60049d3c3a43f6dbba 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
@@ -1076,6 +1076,7 @@ String HTMLCanvasElement::ToDataURLInternal(
@@ -1068,6 +1068,7 @@ String HTMLCanvasElement::ToDataURLInternal(
if (!data_buffer)
return String("data:,");
patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.h.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/third_party/blink/renderer/core/html/canvas/html_canvas_element.h b/third_party/blink/renderer/core/html/canvas/html_canvas_element.h
index 72c7ce2e95ae5480af9c94e839bd869ff74c416d..21869abedf74036e44f0fffe8cbd20242a1d03a1 100644
index 5b737de8de4380fb62734a613cbe8c92423ec877..578fefa354951501fd1e40c16a27efeb8e869901 100644
--- a/third_party/blink/renderer/core/html/canvas/html_canvas_element.h
+++ b/third_party/blink/renderer/core/html/canvas/html_canvas_element.h
@@ -316,6 +316,7 @@ class CORE_EXPORT HTMLCanvasElement final
@@ -312,6 +312,7 @@ class CORE_EXPORT HTMLCanvasElement final
bool IsPlaceholder() const override { return IsOffscreenCanvasRegistered(); }
patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.idl.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/third_party/blink/renderer/core/html/canvas/html_canvas_element.idl b/third_party/blink/renderer/core/html/canvas/html_canvas_element.idl
index fb736088ad8c0a2ea6c709c9dbef40085ca40097..8264d34d716bed721e3297b2ff68ebb297180ac8 100644
index 3340aa80cbf5f059ac0073123ab8af6f4d407647..2739be7dad9210d86248e2ddf0a5a24b3ddc7650 100644
--- a/third_party/blink/renderer/core/html/canvas/html_canvas_element.idl
+++ b/third_party/blink/renderer/core/html/canvas/html_canvas_element.idl
@@ -36,7 +36,7 @@
patches/third_party-blink-renderer-core-script-script_loader.cc.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/third_party/blink/renderer/core/script/script_loader.cc b/third_party/blink/renderer/core/script/script_loader.cc
index 68f54b7aba1befeb7e2a8370024c54d1bd6e2119..54fa48743567f23752dcb7d944efad2edf302efc 100644
index 68f54b7aba1befeb7e2a8370024c54d1bd6e2119..faddc32fb93310ad74853a1e8fa48f2eeaaa8c5f 100644
--- a/third_party/blink/renderer/core/script/script_loader.cc
+++ b/third_party/blink/renderer/core/script/script_loader.cc
@@ -713,6 +713,7 @@ PendingScript* ScriptLoader::PrepareScript(
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 907091555bfbb8be8b3163b2bfe337a37e590feb..ce8416bca8061eb13c42f05e69b0419aec371eec 100644
index e37a216ee6c2eecc4cb2cd3c0587fb4d697f07f6..4e56e34efaa8d278afc318e82d5ad39e5daf21af 100644
--- a/third_party/blink/renderer/modules/BUILD.gn
+++ b/third_party/blink/renderer/modules/BUILD.gn
@@ -16,6 +16,7 @@ if (is_android) {
@@ -15,6 +15,7 @@ if (is_android) {
}
visibility = [ "//third_party/blink/renderer/*" ]
@@ -10,7 +10,7 @@ index 907091555bfbb8be8b3163b2bfe337a37e590feb..ce8416bca8061eb13c42f05e69b0419a
config("modules_implementation") {
defines = [ "BLINK_MODULES_IMPLEMENTATION=1" ]
@@ -172,6 +173,7 @@ component("modules") {
@@ -171,6 +172,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-canvas_rendering_context_2d.cc.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc
index 7c939f2d22d6adc5b62b41106717c5bef69ea5e2..9a777789454f2abc67dc076949da0f7d410ebc3b 100644
index 207010dd0af0ebeed81831c5317cb6bc2972288f..697d92824cd06899a714265fbebbf949fc845334 100644
--- a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc
+++ b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc
@@ -919,6 +919,7 @@ TextMetrics* CanvasRenderingContext2D::measureText(const String& text) {
@@ -922,6 +922,7 @@ TextMetrics* CanvasRenderingContext2D::measureText(const String& text) {
if (!canvas()->GetDocument().GetFrame())
return MakeGarbageCollected<TextMetrics>();
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 0a7dec81dabd45a1314b7c6758cdf959ae34ee7c..0739394d7d633ccacdfdc0e437ecf578ced7489b 100644
index 1eac9ca82003e8f0bb15d0a20e3857fa6bdcfb40..9c8c6093051766d57c2e3304eb7b6ef8f1f912c0 100644
--- a/third_party/blink/renderer/modules/mediastream/media_devices.cc
+++ b/third_party/blink/renderer/modules/mediastream/media_devices.cc
@@ -821,6 +821,7 @@ void MediaDevices::DevicesEnumerated(
@@ -859,6 +859,7 @@ void MediaDevices::DevicesEnumerated(
}
}
patches/third_party-blink-renderer-modules-webgl-webgl2_rendering_context_base.cc.patch
+4 -4
View File
@@ -1,8 +1,8 @@
diff --git a/third_party/blink/renderer/modules/webgl/webgl2_rendering_context_base.cc b/third_party/blink/renderer/modules/webgl/webgl2_rendering_context_base.cc
index f9d8f8e2d785cb728d1a48db72e226eb0b2099c9..dc9d5137ef11bce8ea1b67e015f4805071438684 100644
index 7c6266a03ef194fa5c605c41c92f1eaa120dab58..3829a0796c718eec165dc3589f03c33a9fb2aa79 100644
--- a/third_party/blink/renderer/modules/webgl/webgl2_rendering_context_base.cc
+++ b/third_party/blink/renderer/modules/webgl/webgl2_rendering_context_base.cc
@@ -5213,6 +5213,7 @@ ScriptValue WebGL2RenderingContextBase::getParameter(ScriptState* script_state,
@@ -5237,6 +5237,7 @@ ScriptValue WebGL2RenderingContextBase::getParameter(ScriptState* script_state,
GLenum pname) {
if (isContextLost())
return ScriptValue::CreateNull(script_state->GetIsolate());
@@ -10,7 +10,7 @@ index f9d8f8e2d785cb728d1a48db72e226eb0b2099c9..dc9d5137ef11bce8ea1b67e015f48050
switch (pname) {
case GL_SHADING_LANGUAGE_VERSION: {
return WebGLAny(
@@ -5756,6 +5757,7 @@ ScriptValue WebGL2RenderingContextBase::getFramebufferAttachmentParameter(
@@ -5780,6 +5781,7 @@ ScriptValue WebGL2RenderingContextBase::getFramebufferAttachmentParameter(
if (isContextLost() || !ValidateGetFramebufferAttachmentParameterFunc(
kFunctionName, target, attachment))
return ScriptValue::CreateNull(script_state->GetIsolate());
@@ -18,7 +18,7 @@ index f9d8f8e2d785cb728d1a48db72e226eb0b2099c9..dc9d5137ef11bce8ea1b67e015f48050
WebGLFramebuffer* framebuffer_binding = GetFramebufferBinding(target);
DCHECK(!framebuffer_binding || framebuffer_binding->Object());
@@ -5974,6 +5976,7 @@ ScriptValue WebGL2RenderingContextBase::getTexParameter(
@@ -5998,6 +6000,7 @@ ScriptValue WebGL2RenderingContextBase::getTexParameter(
GLenum pname) {
if (isContextLost() || !ValidateTextureBinding("getTexParameter", target))
return ScriptValue::CreateNull(script_state->GetIsolate());
patches/third_party-blink-renderer-modules-webgl-webgl_rendering_context_base.cc.patch
+22 -22
View File
@@ -1,8 +1,8 @@
diff --git a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
index af9b26da7c1f8d09d673df10ffd917c7d6bb6b93..0bdabb86beb312ba009bc82064cd3f6b0eda34a0 100644
index 4441b31c8802c14825b5836e3e7a2af716c65002..86942a8c9147ee1adb5fc0e8c7494f73c0780082 100644
--- a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
+++ b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
@@ -3042,6 +3042,7 @@ WebGLActiveInfo* WebGLRenderingContextBase::getActiveAttrib(
@@ -3045,6 +3045,7 @@ WebGLActiveInfo* WebGLRenderingContextBase::getActiveAttrib(
GLuint index) {
if (!ValidateWebGLProgramOrShader("getActiveAttrib", program))
return nullptr;
@@ -10,7 +10,7 @@ index af9b26da7c1f8d09d673df10ffd917c7d6bb6b93..0bdabb86beb312ba009bc82064cd3f6b
GLuint program_id = ObjectNonZero(program);
GLint max_name_length = -1;
ContextGL()->GetProgramiv(program_id, GL_ACTIVE_ATTRIBUTE_MAX_LENGTH,
@@ -3073,6 +3074,7 @@ WebGLActiveInfo* WebGLRenderingContextBase::getActiveUniform(
@@ -3076,6 +3077,7 @@ WebGLActiveInfo* WebGLRenderingContextBase::getActiveUniform(
GLuint index) {
if (!ValidateWebGLProgramOrShader("getActiveUniform", program))
return nullptr;
@@ -18,7 +18,7 @@ index af9b26da7c1f8d09d673df10ffd917c7d6bb6b93..0bdabb86beb312ba009bc82064cd3f6b
GLuint program_id = ObjectNonZero(program);
GLint max_name_length = -1;
ContextGL()->GetProgramiv(program_id, GL_ACTIVE_UNIFORM_MAX_LENGTH,
@@ -3103,6 +3105,7 @@ absl::optional<HeapVector<Member<WebGLShader>>>
@@ -3106,6 +3108,7 @@ absl::optional<HeapVector<Member<WebGLShader>>>
WebGLRenderingContextBase::getAttachedShaders(WebGLProgram* program) {
if (!ValidateWebGLProgramOrShader("getAttachedShaders", program))
return absl::nullopt;
@@ -26,7 +26,7 @@ index af9b26da7c1f8d09d673df10ffd917c7d6bb6b93..0bdabb86beb312ba009bc82064cd3f6b
HeapVector<Member<WebGLShader>> shader_objects;
for (GLenum shaderType : {GL_VERTEX_SHADER, GL_FRAGMENT_SHADER}) {
@@ -3117,6 +3120,7 @@ GLint WebGLRenderingContextBase::getAttribLocation(WebGLProgram* program,
@@ -3120,6 +3123,7 @@ GLint WebGLRenderingContextBase::getAttribLocation(WebGLProgram* program,
const String& name) {
if (!ValidateWebGLProgramOrShader("getAttribLocation", program))
return -1;
@@ -34,7 +34,7 @@ index af9b26da7c1f8d09d673df10ffd917c7d6bb6b93..0bdabb86beb312ba009bc82064cd3f6b
if (!ValidateLocationLength("getAttribLocation", name))
return -1;
if (!ValidateString("getAttribLocation", name))
@@ -3150,6 +3154,7 @@ ScriptValue WebGLRenderingContextBase::getBufferParameter(
@@ -3153,6 +3157,7 @@ ScriptValue WebGLRenderingContextBase::getBufferParameter(
GLenum pname) {
if (isContextLost() || !ValidateBufferTarget("getBufferParameter", target))
return ScriptValue::CreateNull(script_state->GetIsolate());
@@ -42,7 +42,7 @@ index af9b26da7c1f8d09d673df10ffd917c7d6bb6b93..0bdabb86beb312ba009bc82064cd3f6b
switch (pname) {
case GL_BUFFER_USAGE: {
@@ -3289,6 +3294,7 @@ ScriptValue WebGLRenderingContextBase::getFramebufferAttachmentParameter(
@@ -3292,6 +3297,7 @@ ScriptValue WebGLRenderingContextBase::getFramebufferAttachmentParameter(
target, attachment))
return ScriptValue::CreateNull(script_state->GetIsolate());
@@ -50,7 +50,7 @@ index af9b26da7c1f8d09d673df10ffd917c7d6bb6b93..0bdabb86beb312ba009bc82064cd3f6b
if (!framebuffer_binding_ || !framebuffer_binding_->Object()) {
SynthesizeGLError(GL_INVALID_OPERATION, "getFramebufferAttachmentParameter",
"no framebuffer bound");
@@ -3687,6 +3693,7 @@ ScriptValue WebGLRenderingContextBase::getParameter(ScriptState* script_state,
@@ -3690,6 +3696,7 @@ ScriptValue WebGLRenderingContextBase::getParameter(ScriptState* script_state,
"invalid parameter name, OES_standard_derivatives not enabled");
return ScriptValue::CreateNull(script_state->GetIsolate());
case WebGLDebugRendererInfo::kUnmaskedRendererWebgl:
@@ -58,7 +58,7 @@ index af9b26da7c1f8d09d673df10ffd917c7d6bb6b93..0bdabb86beb312ba009bc82064cd3f6b
if (ExtensionEnabled(kWebGLDebugRendererInfoName)) {
if (IdentifiabilityStudySettings::Get()->ShouldSampleType(
blink::IdentifiableSurface::Type::kWebGLParameter)) {
@@ -3702,6 +3709,7 @@ ScriptValue WebGLRenderingContextBase::getParameter(ScriptState* script_state,
@@ -3705,6 +3712,7 @@ ScriptValue WebGLRenderingContextBase::getParameter(ScriptState* script_state,
"invalid parameter name, WEBGL_debug_renderer_info not enabled");
return ScriptValue::CreateNull(script_state->GetIsolate());
case WebGLDebugRendererInfo::kUnmaskedVendorWebgl:
@@ -66,7 +66,7 @@ index af9b26da7c1f8d09d673df10ffd917c7d6bb6b93..0bdabb86beb312ba009bc82064cd3f6b
if (ExtensionEnabled(kWebGLDebugRendererInfoName)) {
if (IdentifiabilityStudySettings::Get()->ShouldSampleType(
blink::IdentifiableSurface::Type::kWebGLParameter)) {
@@ -3794,6 +3802,7 @@ ScriptValue WebGLRenderingContextBase::getProgramParameter(
@@ -3797,6 +3805,7 @@ ScriptValue WebGLRenderingContextBase::getProgramParameter(
// intended to prevent applications from entering an infinite polling loop.
if (isContextLost() && pname == GL_COMPLETION_STATUS_KHR)
return WebGLAny(script_state, true);
@@ -74,7 +74,7 @@ index af9b26da7c1f8d09d673df10ffd917c7d6bb6b93..0bdabb86beb312ba009bc82064cd3f6b
if (!ValidateWebGLProgramOrShader("getProgramParamter", program)) {
return ScriptValue::CreateNull(script_state->GetIsolate());
}
@@ -3849,6 +3858,7 @@ ScriptValue WebGLRenderingContextBase::getProgramParameter(
@@ -3852,6 +3861,7 @@ ScriptValue WebGLRenderingContextBase::getProgramParameter(
String WebGLRenderingContextBase::getProgramInfoLog(WebGLProgram* program) {
if (!ValidateWebGLProgramOrShader("getProgramInfoLog", program))
return String();
@@ -82,7 +82,7 @@ index af9b26da7c1f8d09d673df10ffd917c7d6bb6b93..0bdabb86beb312ba009bc82064cd3f6b
GLStringQuery query(ContextGL());
return query.Run<GLStringQuery::ProgramInfoLog>(ObjectNonZero(program));
}
@@ -3859,6 +3869,7 @@ ScriptValue WebGLRenderingContextBase::getRenderbufferParameter(
@@ -3862,6 +3872,7 @@ ScriptValue WebGLRenderingContextBase::getRenderbufferParameter(
GLenum pname) {
if (isContextLost())
return ScriptValue::CreateNull(script_state->GetIsolate());
@@ -90,7 +90,7 @@ index af9b26da7c1f8d09d673df10ffd917c7d6bb6b93..0bdabb86beb312ba009bc82064cd3f6b
if (target != GL_RENDERBUFFER) {
SynthesizeGLError(GL_INVALID_ENUM, "getRenderbufferParameter",
"invalid target");
@@ -3910,6 +3921,7 @@ ScriptValue WebGLRenderingContextBase::getShaderParameter(
@@ -3913,6 +3924,7 @@ ScriptValue WebGLRenderingContextBase::getShaderParameter(
// intended to prevent applications from entering an infinite polling loop.
if (isContextLost() && pname == GL_COMPLETION_STATUS_KHR)
return WebGLAny(script_state, true);
@@ -98,7 +98,7 @@ index af9b26da7c1f8d09d673df10ffd917c7d6bb6b93..0bdabb86beb312ba009bc82064cd3f6b
if (!ValidateWebGLProgramOrShader("getShaderParameter", shader)) {
return ScriptValue::CreateNull(script_state->GetIsolate());
}
@@ -3941,6 +3953,7 @@ ScriptValue WebGLRenderingContextBase::getShaderParameter(
@@ -3944,6 +3956,7 @@ ScriptValue WebGLRenderingContextBase::getShaderParameter(
String WebGLRenderingContextBase::getShaderInfoLog(WebGLShader* shader) {
if (!ValidateWebGLProgramOrShader("getShaderInfoLog", shader))
return String();
@@ -106,7 +106,7 @@ index af9b26da7c1f8d09d673df10ffd917c7d6bb6b93..0bdabb86beb312ba009bc82064cd3f6b
GLStringQuery query(ContextGL());
return query.Run<GLStringQuery::ShaderInfoLog>(ObjectNonZero(shader));
}
@@ -3971,6 +3984,7 @@ WebGLShaderPrecisionFormat* WebGLRenderingContextBase::getShaderPrecisionFormat(
@@ -3974,6 +3987,7 @@ WebGLShaderPrecisionFormat* WebGLRenderingContextBase::getShaderPrecisionFormat(
GLint precision = 0;
ContextGL()->GetShaderPrecisionFormat(shader_type, precision_type, range,
&precision);
@@ -114,7 +114,7 @@ index af9b26da7c1f8d09d673df10ffd917c7d6bb6b93..0bdabb86beb312ba009bc82064cd3f6b
auto* result = MakeGarbageCollected<WebGLShaderPrecisionFormat>(
range[0], range[1], precision);
if (IdentifiabilityStudySettings::Get()->ShouldSampleType(
@@ -3983,6 +3997,7 @@ WebGLShaderPrecisionFormat* WebGLRenderingContextBase::getShaderPrecisionFormat(
@@ -3986,6 +4000,7 @@ WebGLShaderPrecisionFormat* WebGLRenderingContextBase::getShaderPrecisionFormat(
String WebGLRenderingContextBase::getShaderSource(WebGLShader* shader) {
if (!ValidateWebGLProgramOrShader("getShaderSource", shader))
return String();
@@ -122,7 +122,7 @@ index af9b26da7c1f8d09d673df10ffd917c7d6bb6b93..0bdabb86beb312ba009bc82064cd3f6b
return EnsureNotNull(shader->Source());
}
@@ -4008,6 +4023,7 @@ ScriptValue WebGLRenderingContextBase::getTexParameter(
@@ -4011,6 +4026,7 @@ ScriptValue WebGLRenderingContextBase::getTexParameter(
GLenum pname) {
if (isContextLost())
return ScriptValue::CreateNull(script_state->GetIsolate());
@@ -130,7 +130,7 @@ index af9b26da7c1f8d09d673df10ffd917c7d6bb6b93..0bdabb86beb312ba009bc82064cd3f6b
if (!ValidateTextureBinding("getTexParameter", target))
return ScriptValue::CreateNull(script_state->GetIsolate());
switch (pname) {
@@ -4042,6 +4058,7 @@ ScriptValue WebGLRenderingContextBase::getUniform(
@@ -4045,6 +4061,7 @@ ScriptValue WebGLRenderingContextBase::getUniform(
const WebGLUniformLocation* uniform_location) {
if (!ValidateWebGLProgramOrShader("getUniform", program))
return ScriptValue::CreateNull(script_state->GetIsolate());
@@ -138,7 +138,7 @@ index af9b26da7c1f8d09d673df10ffd917c7d6bb6b93..0bdabb86beb312ba009bc82064cd3f6b
DCHECK(uniform_location);
if (uniform_location->Program() != program) {
SynthesizeGLError(GL_INVALID_OPERATION, "getUniform",
@@ -4301,6 +4318,7 @@ WebGLUniformLocation* WebGLRenderingContextBase::getUniformLocation(
@@ -4304,6 +4321,7 @@ WebGLUniformLocation* WebGLRenderingContextBase::getUniformLocation(
const String& name) {
if (!ValidateWebGLProgramOrShader("getUniformLocation", program))
return nullptr;
@@ -146,7 +146,7 @@ index af9b26da7c1f8d09d673df10ffd917c7d6bb6b93..0bdabb86beb312ba009bc82064cd3f6b
if (!ValidateLocationLength("getUniformLocation", name))
return nullptr;
if (!ValidateString("getUniformLocation", name))
@@ -4325,6 +4343,7 @@ ScriptValue WebGLRenderingContextBase::getVertexAttrib(
@@ -4328,6 +4346,7 @@ ScriptValue WebGLRenderingContextBase::getVertexAttrib(
GLenum pname) {
if (isContextLost())
return ScriptValue::CreateNull(script_state->GetIsolate());
@@ -154,7 +154,7 @@ index af9b26da7c1f8d09d673df10ffd917c7d6bb6b93..0bdabb86beb312ba009bc82064cd3f6b
if (index >= max_vertex_attribs_) {
SynthesizeGLError(GL_INVALID_VALUE, "getVertexAttrib",
"index out of range");
@@ -4402,6 +4421,7 @@ int64_t WebGLRenderingContextBase::getVertexAttribOffset(GLuint index,
@@ -4405,6 +4424,7 @@ int64_t WebGLRenderingContextBase::getVertexAttribOffset(GLuint index,
GLenum pname) {
if (isContextLost())
return 0;
@@ -162,7 +162,7 @@ index af9b26da7c1f8d09d673df10ffd917c7d6bb6b93..0bdabb86beb312ba009bc82064cd3f6b
GLvoid* result = nullptr;
// NOTE: If pname is ever a value that returns more than 1 element
// this will corrupt memory.
@@ -4757,6 +4777,7 @@ void WebGLRenderingContextBase::ReadPixelsHelper(GLint x,
@@ -4760,6 +4780,7 @@ void WebGLRenderingContextBase::ReadPixelsHelper(GLint x,
int64_t offset) {
if (isContextLost())
return;
patches/tools-grit-grit-gather-policy_json.py.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/tools/grit/grit/gather/policy_json.py b/tools/grit/grit/gather/policy_json.py
index dc50b9f5e68e2616810e9f451c2dbdaf94a0fe8e..e0a6c341e8b8e618ba6809e49f672078a4395f39 100644
index e084c7214d82cb6319082cb53b9bc63364bf63c9..9a08e959d312aaa528ed9bb0a247dc392e537cef 100644
--- a/tools/grit/grit/gather/policy_json.py
+++ b/tools/grit/grit/gather/policy_json.py
@@ -330,3 +330,4 @@ class PolicyJson(skeleton_gatherer.SkeletonGatherer):
@@ -354,3 +354,4 @@ class PolicyJson(skeleton_gatherer.SkeletonGatherer):
}
else:
raise Exception('Unknown build')
patches/tools-licenses.py.patch
+5 -5
View File
@@ -1,8 +1,8 @@
diff --git a/tools/licenses.py b/tools/licenses.py
index 677c63364f472a576565ce4f36c26d2185f77687..dfcebe8c1459096f9746578bf7441ec6e063b153 100755
index de49fae95801e402cef4cda481bdf17222c9525c..fee2b33b157778166239c3410b6ea08342d5337a 100755
--- a/tools/licenses.py
+++ b/tools/licenses.py
@@ -35,6 +35,7 @@ else:
@@ -39,6 +39,7 @@ from spdx_writer import SpdxWriter
_REPOSITORY_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
sys.path.insert(0, os.path.join(_REPOSITORY_ROOT, 'build/android/gyp'))
from util import build_utils
@@ -10,7 +10,7 @@ index 677c63364f472a576565ce4f36c26d2185f77687..dfcebe8c1459096f9746578bf7441ec6
# Paths from the root of the tree to directories to skip.
@@ -381,6 +382,7 @@ SPECIAL_CASES = {
@@ -385,6 +386,7 @@ SPECIAL_CASES = {
"License File": "/third_party/selenium-atoms/LICENSE.closure",
},
}
@@ -18,7 +18,7 @@ index 677c63364f472a576565ce4f36c26d2185f77687..dfcebe8c1459096f9746578bf7441ec6
# Special value for 'License File' field used to indicate that the license file
# should not be used in about:credits.
@@ -574,7 +576,8 @@ def FindThirdPartyDirs(prune_paths, root, extra_third_party_dirs=None):
@@ -578,7 +580,8 @@ def FindThirdPartyDirs(prune_paths, root, extra_third_party_dirs=None):
if skip in dirs:
dirs.remove(skip)
@@ -28,7 +28,7 @@ index 677c63364f472a576565ce4f36c26d2185f77687..dfcebe8c1459096f9746578bf7441ec6
# Add all subdirectories that are not marked for skipping.
for dir in dirs:
dirpath = os.path.join(path, dir)
@@ -785,7 +788,8 @@ def GenerateCredits(file_template_file,
@@ -801,7 +804,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
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/tools/metrics/histograms/metadata/histogram_suffixes_list.xml b/tools/metrics/histograms/metadata/histogram_suffixes_list.xml
index 79c181d67e4157484e0a6a78dccf46ec28602bcb..ff63c1950e0d004bce687f6151da4ffffa5221c0 100644
index a99ccc4f55b2925a0318bc1baf4f81bca1185d33..26da4027de2cb856fc85cc42a0b3f6cd42e9f0b0 100644
--- a/tools/metrics/histograms/metadata/histogram_suffixes_list.xml
+++ b/tools/metrics/histograms/metadata/histogram_suffixes_list.xml
@@ -7206,6 +7206,7 @@ chromium-metrics-reviews@google.com.
patches/v8/BUILD.gn.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/BUILD.gn b/BUILD.gn
index 0063c600b4dd70abdfeaeff7ba35f5bc70582ba0..d534352082c5b6608987cfac4eb25864c979b69e 100644
index 78fd8cd2d387902406c2663f5217e6b8717a5c30..984560838e305098a76f022f2da755dc6c1893a1 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -621,6 +621,7 @@ config("internal_config_base") {