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

Updated patches from Chromium 102.0.4997.0 to Chromium 102.0.4999.0.

Browse Source
This commit is contained in:
Claudio DeSouza
2022-05-13 18:01:41 +01:00
parent 48edadfe19
commit e193a44b52
36 changed files with 350 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
patches/base-BUILD.gn.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/base/BUILD.gn b/base/BUILD.gn
index 15da9351b899b669e4d5f4c9fd58a3dc692b2452..9756061cafbae74fb0a1b2a6e0800d55bf140230 100644
index 10fad189be7dff8d4781ebf3a73e09046ecd908d..8185492547a8b4a80be69359a0e7bac8441d4b6f 100644
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
@@ -4128,6 +4128,7 @@ if (is_android) {
@@ -4120,6 +4120,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 a22b32052cfeb03cfcef31a761fc1bf6fe53793f..9bcb8d7886b6effeca87f7acaef7cfb383e10744 100644
index 5f1deb141679a60e25f837bbdf471b8e38dc21db..ceaa075306e37213e820ef607e3669f63f8533e6 100644
--- a/base/threading/thread_restrictions.h
+++ b/base/threading/thread_restrictions.h
@@ -556,6 +556,7 @@ class BASE_EXPORT ScopedAllowBaseSyncPrimitives {
@@ -546,6 +546,7 @@ class BASE_EXPORT ScopedAllowBaseSyncPrimitives {
ScopedAllowBaseSyncPrimitives& operator=(
const ScopedAllowBaseSyncPrimitives&) = delete;
patches/build-config-android-config.gni.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/build/config/android/config.gni b/build/config/android/config.gni
index 56e2c642190f02d3f64949ed5e1e2a48a0ab56d9..8515d39c371713966b111e8d58f3055015a24c53 100644
index 56e2c642190f02d3f64949ed5e1e2a48a0ab56d9..d1465cbb76937e7ec35d29ff2ba7d85d8745d84f 100644
--- a/build/config/android/config.gni
+++ b/build/config/android/config.gni
@@ -8,6 +8,7 @@
patches/chrome-BUILD.gn.patch
+5 -5
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
index 5c61307e43d8ad9e16354750fb60e25b97c7cb88..1313426a1058c47c3e0460343c1c5c68a5c0410c 100644
index 7203dde2f96d5e8ed44443e21a2257166b6e6f36..8833d83da71d57d08bd0738d2f7b72206a950260 100644
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -170,6 +170,7 @@ if (!is_android && !is_mac) {
@@ -69,7 +69,7 @@ index 5c61307e43d8ad9e16354750fb60e25b97c7cb88..1313426a1058c47c3e0460343c1c5c68
}
extra_substitutions = [
@@ -1192,6 +1199,7 @@ if (is_win) {
@@ -1187,6 +1194,7 @@ if (is_win) {
chrome_dylib_version,
"-Wl,-order_file," + rebase_path("app/framework.order", root_build_dir),
]
@@ -77,7 +77,7 @@ index 5c61307e43d8ad9e16354750fb60e25b97c7cb88..1313426a1058c47c3e0460343c1c5c68
if (!is_component_build) {
# Specify a sensible install_name for static builds. The library is
@@ -1370,6 +1378,7 @@ if (is_win) {
@@ -1365,6 +1373,7 @@ if (is_win) {
group("dependencies") {
public_deps = [
@@ -85,7 +85,7 @@ index 5c61307e43d8ad9e16354750fb60e25b97c7cb88..1313426a1058c47c3e0460343c1c5c68
"//build:branding_buildflags",
"//build:chromeos_buildflags",
"//chrome/browser",
@@ -1440,7 +1449,7 @@ group("dependencies") {
@@ -1435,7 +1444,7 @@ group("dependencies") {
if (is_win) {
process_version_rc_template("chrome_exe_version") {
@@ -94,7 +94,7 @@ index 5c61307e43d8ad9e16354750fb60e25b97c7cb88..1313426a1058c47c3e0460343c1c5c68
output = "$target_gen_dir/chrome_exe_version.rc"
}
@@ -1494,6 +1503,7 @@ group("resources") {
@@ -1489,6 +1498,7 @@ group("resources") {
"//chrome/browser:resources",
"//chrome/common:resources",
"//chrome/renderer:resources",
patches/chrome-VERSION.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/VERSION b/chrome/VERSION
index bb3f710b22ffe930c8cbd740c61d5af1fe55d6a2..05f435dd600e5c05490fbc97a6686dab8a9a37cc 100644
index bb3f710b22ffe930c8cbd740c61d5af1fe55d6a2..3f69737cd2ccabd75ce8f25566585e91e2f9aeb2 100644
--- a/chrome/VERSION
+++ b/chrome/VERSION
@@ -1,4 +1,4 @@
patches/chrome-android-BUILD.gn.patch
+6 -6
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
index 68de25a45f9756c78dd185f650dcec59e61cf62f..d6ecf755cc0e13aeea270bec8cdf64f47b347117 100644
index 9b43c518db2156ba3241ce9704f2e1c27c006f8e..202f93d7216b45236ca7cc5191c4eca2bd01a890 100644
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -270,6 +270,7 @@ android_resources("chrome_app_java_resources") {
@@ -10,7 +10,7 @@ index 68de25a45f9756c78dd185f650dcec59e61cf62f..d6ecf755cc0e13aeea270bec8cdf64f4
}
if (enable_vr) {
@@ -652,6 +653,7 @@ android_library("chrome_java") {
@@ -653,6 +654,7 @@ android_library("chrome_java") {
]
deps += feed_deps
@@ -42,7 +42,7 @@ index 68de25a45f9756c78dd185f650dcec59e61cf62f..d6ecf755cc0e13aeea270bec8cdf64f4
}
action_with_pydeps("chrome_android_java_google_api_keys_srcjar") {
@@ -2242,6 +2247,7 @@ if (current_toolchain == default_toolchain) {
@@ -2238,6 +2243,7 @@ if (current_toolchain == default_toolchain) {
":${_variant}_locale_pak_assets",
":${_variant}_paks",
]
@@ -50,7 +50,7 @@ index 68de25a45f9756c78dd185f650dcec59e61cf62f..d6ecf755cc0e13aeea270bec8cdf64f4
if (_is_monochrome) {
deps += [ "//android_webview:locale_pak_assets" ]
if (webview_includes_weblayer && !_is_bundle_module) {
@@ -2506,6 +2512,7 @@ template("chrome_public_apk_or_module_tmpl") {
@@ -2496,6 +2502,7 @@ template("chrome_public_apk_or_module_tmpl") {
load_library_from_apk = chromium_linker_supported
version_name = chrome_version_name
@@ -58,7 +58,7 @@ index 68de25a45f9756c78dd185f650dcec59e61cf62f..d6ecf755cc0e13aeea270bec8cdf64f4
}
}
@@ -2647,6 +2654,7 @@ android_library("base_module_java") {
@@ -2636,6 +2643,7 @@ android_library("base_module_java") {
"//components/payments/content/android:service_java",
"//third_party/androidx:androidx_browser_browser_java",
]
@@ -66,7 +66,7 @@ index 68de25a45f9756c78dd185f650dcec59e61cf62f..d6ecf755cc0e13aeea270bec8cdf64f4
# More deps for DFMs.
if (dfmify_dev_ui) {
@@ -2797,6 +2805,7 @@ template("monochrome_public_apk_or_module_tmpl") {
@@ -2786,6 +2794,7 @@ template("monochrome_public_apk_or_module_tmpl") {
deps += [ "//weblayer/browser/java:upstream_java" ]
}
}
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 d677db6cadce3b7bd16450741b9cc283ce135f7e..d06996faf18084bbc44d5888dc662d33ed4833d8 100644
index b3e1abe7b801acf4345cf30539dd59b71572e502..9c60d91756d11aa3cadd593fccf9511736ad434c 100644
--- a/chrome/android/chrome_java_sources.gni
+++ b/chrome/android/chrome_java_sources.gni
@@ -1235,3 +1235,4 @@ chrome_java_sources = [
@@ -1237,3 +1237,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-android-java-AndroidManifest.xml.patch
+3 -3
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
index ec0ffaf63c816fc061e36174b1fbd4c0c5a2c113..43263986f277a1c16eb0367dab8e9620ab70a9e3 100644
index b31d14a673bb536c55ca146a3ad0100f6814e13f..fb2bb2e7a448d01e5866d5cf1e40e2fe9ede3681 100644
--- a/chrome/android/java/AndroidManifest.xml
+++ b/chrome/android/java/AndroidManifest.xml
@@ -59,18 +59,26 @@ by a child template that "extends" this file.
@@ -71,7 +71,7 @@ index ec0ffaf63c816fc061e36174b1fbd4c0c5a2c113..43263986f277a1c16eb0367dab8e9620
<meta-data android:name="android.app.searchable"
android:resource="@xml/searchable" />
</activity-alias>
@@ -1229,6 +1243,7 @@ by a child template that "extends" this file.
@@ -1239,6 +1253,7 @@ by a child template that "extends" this file.
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize" >
</activity>
@@ -79,7 +79,7 @@ index ec0ffaf63c816fc061e36174b1fbd4c0c5a2c113..43263986f277a1c16eb0367dab8e9620
{% block extra_application_definitions %}
{% endblock %}
{% endmacro %}
@@ -1307,6 +1322,7 @@ by a child template that "extends" this file.
@@ -1317,6 +1332,7 @@ by a child template that "extends" this file.
<!-- ARCore APK integration -->
<!-- This tag indicates that this application optionally uses ARCore. -->
<meta-data android:name="com.google.ar.core" android:value="optional" />
patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-ManageSyncSettings.java.patch
+2 -2
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java
index 7fc321fee2787463c58b52c3bdbe97992dc08693..ed9d775c828b9b26edce45e667989ebef6bb1d4d 100644
index fdf3a2ea317e93e259fe26e686358cb22686f8ea..1f115ed5a297b4809d1f385a371fea27520adf06 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java
@@ -24,7 +24,7 @@ import androidx.appcompat.app.AppCompatActivity;
@@ -11,7 +11,7 @@ index 7fc321fee2787463c58b52c3bdbe97992dc08693..ed9d775c828b9b26edce45e667989ebe
import androidx.preference.Preference;
import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceFragmentCompat;
@@ -374,7 +374,7 @@ public class ManageSyncSettings extends PreferenceFragmentCompat
@@ -373,7 +373,7 @@ public class ManageSyncSettings extends PreferenceFragmentCompat
IdentityServicesProvider.get()
.getIdentityManager(Profile.getLastUsedRegularProfile())
.getPrimaryAccountInfo(ConsentLevel.SYNC));
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 5c126bf6ff1390417f967247d1b0940dd66231e3..aee924d31e88864310fd91788ca44193444c4632 100644
index 02e4b0e27f4a0d3409327ba929f78b129dc06385..4acd11452bd569e982ce836981b3e3e13263aa19 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -2596,6 +2596,7 @@ static_library("browser") {
@@ -2595,6 +2595,7 @@ static_library("browser") {
"performance_monitor/metric_evaluator_helper_posix.h",
]
}
patches/chrome-browser-about_flags.cc.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index afbd4aebfb85e1152d338365ab11d77f1e1872da..2b7436860b4f3552bda346b4bc2f6ded18c30790 100644
index 51928eda8227c66567aa2a7fd40d73b71ab5b039..90b0305079be8e46d7c60abb19a107c36aad19db 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -3011,6 +3011,7 @@ const FeatureEntry::FeatureVariation kDesktopSharePreviewVariations[] = {
patches/chrome-browser-chrome_content_browser_client.h.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/chrome_content_browser_client.h b/chrome/browser/chrome_content_browser_client.h
index 41a5ddd24bbfcb453cd0b2158d0b2bb2908d49f2..2e5d2a1cd796acbba203564276c55335eee04737 100644
index f0415a5099cdf181ab620fb6400db4f524c2c892..75d763c33a425f21d0aa62e77fd37c27408338d7 100644
--- a/chrome/browser/chrome_content_browser_client.h
+++ b/chrome/browser/chrome_content_browser_client.h
@@ -802,6 +802,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
@@ -804,6 +804,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
}
private:
patches/chrome-browser-flags-android-chrome_feature_list.cc.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
index 3efb98ed0ff70e86342c1f344ef960d059c6f321..e0bcaaa69a692dadfea3bbf98b2b03f1d30a195a 100644
index e7ea7517f0020977aeff1caa1a5e7e44d84cf800..7478363c0ae94dcf0e88e2bb2c805a1ec83d4b3f 100644
--- a/chrome/browser/flags/android/chrome_feature_list.cc
+++ b/chrome/browser/flags/android/chrome_feature_list.cc
@@ -368,6 +368,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
@@ -371,6 +371,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
};
const base::Feature* FindFeatureExposedToJava(const std::string& feature_name) {
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 b26bef7fb2293d320940a94314c866d913765685..3a978a2f111921a46fc955a65e1aa48cd60b6849 100644
index 0fab3f564007d932d1387c3d8fdcd31303f268f1..fcd80c94087d5a18c57778937e5f806187b20e5d 100644
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -653,6 +653,7 @@ static_library("ui") {
@@ -10,7 +10,7 @@ index b26bef7fb2293d320940a94314c866d913765685..3a978a2f111921a46fc955a65e1aa48c
# TODO(crbug/925153): Remove this circular dependency.
allow_circular_includes_from = [
@@ -3833,10 +3834,13 @@ static_library("ui") {
@@ -3836,10 +3837,13 @@ static_library("ui") {
]
deps += [ "//google_update" ]
} else {
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 84ad9d01a410c5d837a7030d4e92ea2b6067a069..d6650bac4423ea88d98dada6b12c596535ce07c7 100644
index c6aefbb30b1ba96fbf247dd0d9922f9c01dc5092..0c4878000d7a61a4e2f8a6fd7a04156af15c0ab0 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
@@ -223,6 +223,7 @@ const ui::ImageModel PageInfoViewFactory::GetPermissionIcon(
patches/chrome-browser-ui-views-toolbar-toolbar_view.cc.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/ui/views/toolbar/toolbar_view.cc b/chrome/browser/ui/views/toolbar/toolbar_view.cc
index 1ab19d8ef449316a4be072d3ed8f88a42a4e8eb6..eea63acd4417a93c084581f4a918a333e81c24fb 100644
index 8dceab5d386ec7bd3cc51c8ba2d29136854948fa..0cca8464b25fbd34d2913688cdd3e59b17542323 100644
--- a/chrome/browser/ui/views/toolbar/toolbar_view.cc
+++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc
@@ -302,6 +302,7 @@ void ToolbarView::Init() {
patches/chrome-browser-ui-webui-settings-site_settings_helper.cc.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/ui/webui/settings/site_settings_helper.cc b/chrome/browser/ui/webui/settings/site_settings_helper.cc
index 4a70725e8f31affe1e8f18ad03585310b1496b71..8fd657ccfc958a0b0b20308b74ef69359947c862 100644
index 09fbc2969523f10d271bb63e2138fd0d7b1e8f0c..de5370e6b4a3abb464a60fab0e3696cce3fcd924 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[] = {
patches/chrome-test-BUILD.gn.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index c8b7ac2149047c29b6948a9c785bc1af0bfbfd2b..0d94b2ef1fc396840a6d61c9febbaf7551fb0fc8 100644
index 060e49987d27be37afb2b85e658525d4edc08df6..089d1ca9268dc3ffd76fea46d439ebf517cd1f0c 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -306,6 +306,7 @@ static_library("test_support") {
patches/components-content_settings-core-browser-content_settings_default_provider.cc.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/components/content_settings/core/browser/content_settings_default_provider.cc b/components/content_settings/core/browser/content_settings_default_provider.cc
index 3935fe80b14ccb108ff6e0ff9773185a053a4997..dacbe9fa25d6fc15ec75e8eb0319d29aa30f57db 100644
index 1f6642baaf50f5cf1d3bd1f84a1fa9ce925599c1..9611f0899649ae2e3c7dc447b02c9a4e2b87cbec 100644
--- a/components/content_settings/core/browser/content_settings_default_provider.cc
+++ b/components/content_settings/core/browser/content_settings_default_provider.cc
@@ -434,6 +434,7 @@ void DefaultProvider::DiscardOrMigrateObsoletePreferences() {
@@ -438,6 +438,7 @@ void DefaultProvider::DiscardOrMigrateObsoletePreferences() {
}
prefs_->ClearPref(kDeprecatedEnableDRM);
#endif // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_WIN)
patches/components-content_settings-core-browser-content_settings_registry.cc.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc
index 8c509c9448f28b36e553930e10cf3460d329971f..57b53f8928f55e8ba31503bda2dd2a1b50b613a8 100644
index 272fef3f74acc60f0b9d9f36b2a81e7242b426ac..16cb03685fd3ba3a357df2b20025b153f29dfb7d 100644
--- a/components/content_settings/core/browser/content_settings_registry.cc
+++ b/components/content_settings/core/browser/content_settings_registry.cc
@@ -664,6 +664,7 @@ void ContentSettingsRegistry::Init() {
patches/components-content_settings-core-common-content_settings.cc.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/components/content_settings/core/common/content_settings.cc b/components/content_settings/core/common/content_settings.cc
index e08368cd6a4d52f1b960c506529c17886350cda6..0e593b125ed36f2644c24863fb732b1ecd249329 100644
index cbd9e864447c08a7755a290c2f49aa53b805b685..9223d613843e6bf2887c9293365f4df6c6f2e8ed 100644
--- a/components/content_settings/core/common/content_settings.cc
+++ b/components/content_settings/core/common/content_settings.cc
@@ -103,6 +103,7 @@ constexpr HistogramValue kHistogramValue[] = {
patches/components-content_settings-core-common-content_settings_types.h.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/components/content_settings/core/common/content_settings_types.h b/components/content_settings/core/common/content_settings_types.h
index 9ef5f49c2fbc0ef8ce5f76a3916b7f300cbcd760..5529b76d9ab20e5aaa91c2b397d766a193e54a1d 100644
index 03eeba359b37f44d4b5fde44ccee5daf281d91a4..1d630e23c263816abdf0b87787aed76b0c6e4f39 100644
--- a/components/content_settings/core/common/content_settings_types.h
+++ b/components/content_settings/core/common/content_settings_types.h
@@ -288,6 +288,7 @@ enum class ContentSettingsType : int32_t {
patches/components-page_info-page_info.cc.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/components/page_info/page_info.cc b/components/page_info/page_info.cc
index 9d867b80283ce17d73097845479af79c29bbc32b..6cca34a4a432d7bb35ff44c7da2792f27a5233c8 100644
index 42ef7f15dadfb2dd2e90f30efcacc20f7504261f..5ccf0eb2f1656c724b2075df8276fa24bafcfbcd 100644
--- a/components/page_info/page_info.cc
+++ b/components/page_info/page_info.cc
@@ -995,6 +995,7 @@ void PageInfo::PresentSitePermissions() {
@@ -997,6 +997,7 @@ void PageInfo::PresentSitePermissions() {
}
}
patches/components-permissions-permission_uma_util.cc.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/components/permissions/permission_uma_util.cc b/components/permissions/permission_uma_util.cc
index 4448c55b390f759fbea20c55cb60d4d37203edba..256bdafb792954b3c8fa9883efa0587862b5a8d7 100644
index 5a5da3a0bc9cd4763e7282c0d9537f26ca9f721a..2e294f510fd182025a898899d1cdbc97fc5ed566 100644
--- a/components/permissions/permission_uma_util.cc
+++ b/components/permissions/permission_uma_util.cc
@@ -111,6 +111,7 @@ RequestTypeForUma GetUmaValueForRequestType(RequestType request_type) {
patches/components-permissions-request_type.cc.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/components/permissions/request_type.cc b/components/permissions/request_type.cc
index 0a19ef3c9d4b32b0cb08905883c3f16962a46a0d..38c219e4a99728b46530610e0a1b90c7c74bd7ab 100644
index 4292d967014ece488505ddefbc89d42d89554eb7..a8d0c5492bf8030bcde747ced1687895a341a405 100644
--- a/components/permissions/request_type.cc
+++ b/components/permissions/request_type.cc
@@ -330,6 +330,7 @@ const char* PermissionKeyForRequestType(permissions::RequestType request_type) {
patches/content-browser-renderer_host-navigation_request.cc.patch
+2 -2
View File
@@ -1,5 +1,5 @@
diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc
index c9dc13f15119ad0911a1b3ef1d4fff8443e21468..765bfe59ddeb781cb7383c4e4e53b20326fcba49 100644
index 551706204c2e8a277bb401287680ca0048d61fab..60a29c931646f652ac11b2cc220fdaa34fa28ff6 100644
--- a/content/browser/renderer_host/navigation_request.cc
+++ b/content/browser/renderer_host/navigation_request.cc
@@ -2646,6 +2646,7 @@ void NavigationRequest::OnRequestRedirected(
@@ -10,7 +10,7 @@ index c9dc13f15119ad0911a1b3ef1d4fff8443e21468..765bfe59ddeb781cb7383c4e4e53b203
common_params_->referrer = Referrer::SanitizeForRequest(
common_params_->url, *common_params_->referrer);
@@ -3980,6 +3981,7 @@ void NavigationRequest::OnStartChecksComplete(
@@ -3973,6 +3974,7 @@ void NavigationRequest::OnStartChecksComplete(
headers.MergeFrom(TakeModifiedRequestHeaders());
begin_params_->headers = headers.ToString();
patches/content-public-browser-content_browser_client.h.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
index d6ad990189520f7fc15e04c1c4bd03588d3ee81e..b6ff0c62332235d9ea397e6a15e2af9be377b216 100644
index ae3dda4b9b40bb0d4c1a10eaedda9270d3543a8b..119ebabeb12de4d15a75ba5de93207c512bd6f9b 100644
--- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h
@@ -1970,6 +1970,7 @@ class CONTENT_EXPORT ContentBrowserClient {
@@ -1971,6 +1971,7 @@ class CONTENT_EXPORT ContentBrowserClient {
virtual ui::AXMode GetAXModeForBrowserContext(
BrowserContext* browser_context);
patches/content-renderer-render_frame_impl.cc.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 448e5e6eab9e3bb98569a1d60619732173a396d2..aed12c1bac4f7d2b85691993459ba6fdf8e7a417 100644
index 596dc721842c707844a771d64337e9cf0d82bfcc..d60b028ef0cac141c58c31c5d0f148d40cb2b032 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -4526,6 +4526,7 @@ bool RenderFrameImpl::ShouldUseUserAgentOverride() const {
patches/net-cookies-canonical_cookie.cc.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/net/cookies/canonical_cookie.cc b/net/cookies/canonical_cookie.cc
index aed5d7fe4ae950b14f5d9e483646713d6c55aff1..18008478986b56a597b55267e083e2582744114c 100644
index 053f760ed76dfa5f5ed21a672ee24d9e34f301ed..5b056c63d0371c8fb6684c7c6c3bd70a722a5c1f 100644
--- a/net/cookies/canonical_cookie.cc
+++ b/net/cookies/canonical_cookie.cc
@@ -602,6 +602,7 @@ std::unique_ptr<CanonicalCookie> CanonicalCookie::Create(
@@ -603,6 +603,7 @@ std::unique_ptr<CanonicalCookie> CanonicalCookie::Create(
// Get the port, this will get a default value if a port isn't provided.
int source_port = ValidateAndAdjustSourcePort(url.EffectiveIntPort());
patches/net-cookies-cookie_monster_unittest.cc.patch
+158
View File
@@ -0,0 +1,158 @@
diff --git a/net/cookies/cookie_monster_unittest.cc b/net/cookies/cookie_monster_unittest.cc
index 97d5adf9d86294f1390574b5438c5e4d7f220a80..88521a441870aa9573070064b61410053557e87c 100644
--- a/net/cookies/cookie_monster_unittest.cc
+++ b/net/cookies/cookie_monster_unittest.cc
@@ -569,8 +569,8 @@ class CookieMonsterTestBase : public CookieStoreTest<T> {
EXPECT_EQ(expected_secure, num_secure);
// Validate each priority.
- size_t expected_count[3] = {
- expected_low_count, expected_medium_count, expected_high_count};
+ size_t expected_count[3] = {expected_low_count, expected_medium_count,
+ expected_high_count};
for (int i = 0; i < 3; ++i) {
size_t num_for_priority =
surviving_id_list[0][i].size() + surviving_id_list[1][i].size();
@@ -825,8 +825,7 @@ class CookieMonsterTestBase : public CookieStoreTest<T> {
//
// Round 1 => 10LN; round 2 => none; round 3 => none.
// Round 4 => 21HN; round 5 => none; round 6 => none.
- TestPriorityCookieCase(cm.get(), "39LN 1LS 141HN", 30U, 0U, 120U, 149U,
- 1U);
+ TestPriorityCookieCase(cm.get(), "39LN 1LS 141HN", 30U, 0U, 120U, 149U, 1U);
// Round 1 => none; round 2 => none; round 3 => 10MN.
// Round 4 => none; round 5 => none; round 6 => 21HS.
TestPriorityCookieCase(cm.get(), "29LN 1LS 59MN 1MS 91HS", 30U, 50U, 70U,
@@ -1062,7 +1061,7 @@ class DeferredCookieTaskTest : public CookieMonsterTest {
TEST_F(DeferredCookieTaskTest, DeferredGetCookieList) {
DeclareLoadedCookie(http_www_foo_.url(),
- "X=1; path=/; expires=Mon, 18-Apr-22 22:50:14 GMT",
+ "X=1; path=/; expires=Mon, 18-Apr-62 22:50:14 GMT",
Time::Now() + base::Days(3));
GetCookieListCallback call1;
@@ -1152,7 +1151,7 @@ TEST_F(DeferredCookieTaskTest, DeferredSetAllCookies) {
TEST_F(DeferredCookieTaskTest, DeferredGetAllCookies) {
DeclareLoadedCookie(http_www_foo_.url(),
- "X=1; path=/; expires=Mon, 18-Apr-22 22:50:14 GMT",
+ "X=1; path=/; expires=Mon, 18-Apr-62 22:50:14 GMT",
Time::Now() + base::Days(3));
GetAllCookiesCallback call1;
@@ -1174,7 +1173,7 @@ TEST_F(DeferredCookieTaskTest, DeferredGetAllCookies) {
TEST_F(DeferredCookieTaskTest, DeferredGetAllForUrlCookies) {
DeclareLoadedCookie(http_www_foo_.url(),
- "X=1; path=/; expires=Mon, 18-Apr-22 22:50:14 GMT",
+ "X=1; path=/; expires=Mon, 18-Apr-62 22:50:14 GMT",
Time::Now() + base::Days(3));
GetCookieListCallback call1;
@@ -1200,7 +1199,7 @@ TEST_F(DeferredCookieTaskTest, DeferredGetAllForUrlCookies) {
TEST_F(DeferredCookieTaskTest, DeferredGetAllForUrlWithOptionsCookies) {
DeclareLoadedCookie(http_www_foo_.url(),
- "X=1; path=/; expires=Mon, 18-Apr-22 22:50:14 GMT",
+ "X=1; path=/; expires=Mon, 18-Apr-62 22:50:14 GMT",
Time::Now() + base::Days(3));
GetCookieListCallback call1;
@@ -1226,7 +1225,7 @@ TEST_F(DeferredCookieTaskTest, DeferredGetAllForUrlWithOptionsCookies) {
TEST_F(DeferredCookieTaskTest, DeferredDeleteAllCookies) {
DeclareLoadedCookie(http_www_foo_.url(),
- "X=1; path=/; expires=Mon, 18-Apr-22 22:50:14 GMT",
+ "X=1; path=/; expires=Mon, 18-Apr-62 22:50:14 GMT",
Time::Now() + base::Days(3));
ResultSavingCookieCallback<uint32_t> call1;
@@ -1363,7 +1362,7 @@ TEST_F(DeferredCookieTaskTest, DeferredDeleteSessionCookies) {
TEST_F(DeferredCookieTaskTest, DeferredTaskOrder) {
cookie_monster_->SetPersistSessionCookies(true);
DeclareLoadedCookie(http_www_foo_.url(),
- "X=1; path=/; expires=Mon, 18-Apr-22 22:50:14 GMT",
+ "X=1; path=/; expires=Mon, 18-Apr-62 22:50:14 GMT",
Time::Now() + base::Days(3));
bool get_cookie_list_callback_was_run = false;
@@ -1440,7 +1439,7 @@ TEST_F(CookieMonsterTest, TestCookieDeleteAll) {
// Create a persistent cookie.
EXPECT_TRUE(SetCookie(
cm.get(), http_www_foo_.url(),
- std::string(kValidCookieLine) + "; expires=Mon, 18-Apr-22 22:50:13 GMT"));
+ std::string(kValidCookieLine) + "; expires=Mon, 18-Apr-62 22:50:13 GMT"));
ASSERT_EQ(1u, store->commands().size());
EXPECT_EQ(CookieStoreCommand::ADD, store->commands()[0].type);
@@ -2240,20 +2239,20 @@ TEST_F(CookieMonsterTest, DontImportDuplicateCookies) {
// the import.
AddCookieToList(GURL("http://www.foo.com"),
- "X=1; path=/; expires=Mon, 18-Apr-22 22:50:14 GMT",
+ "X=1; path=/; expires=Mon, 18-Apr-62 22:50:14 GMT",
Time::Now() + base::Days(3), &initial_cookies);
AddCookieToList(GURL("http://www.foo.com"),
- "X=2; path=/; expires=Mon, 18-Apr-22 22:50:14 GMT",
+ "X=2; path=/; expires=Mon, 18-Apr-62 22:50:14 GMT",
Time::Now() + base::Days(1), &initial_cookies);
// ===> This one is the WINNER (biggest creation time). <====
AddCookieToList(GURL("http://www.foo.com"),
- "X=3; path=/; expires=Mon, 18-Apr-22 22:50:14 GMT",
+ "X=3; path=/; expires=Mon, 18-Apr-62 22:50:14 GMT",
Time::Now() + base::Days(4), &initial_cookies);
AddCookieToList(GURL("http://www.foo.com"),
- "X=4; path=/; expires=Mon, 18-Apr-22 22:50:14 GMT",
+ "X=4; path=/; expires=Mon, 18-Apr-62 22:50:14 GMT",
Time::Now(), &initial_cookies);
// Insert 2 cookies with name "X" on path "/2", with varying creation
@@ -2261,16 +2260,16 @@ TEST_F(CookieMonsterTest, DontImportDuplicateCookies) {
// ===> This one is the WINNER (biggest creation time). <====
AddCookieToList(GURL("http://www.foo.com"),
- "X=a1; path=/2; expires=Mon, 18-Apr-22 22:50:14 GMT",
+ "X=a1; path=/2; expires=Mon, 18-Apr-62 22:50:14 GMT",
Time::Now() + base::Days(9), &initial_cookies);
AddCookieToList(GURL("http://www.foo.com"),
- "X=a2; path=/2; expires=Mon, 18-Apr-22 22:50:14 GMT",
+ "X=a2; path=/2; expires=Mon, 18-Apr-62 22:50:14 GMT",
Time::Now() + base::Days(2), &initial_cookies);
// Insert 1 cookie with name "Y" on path "/".
AddCookieToList(GURL("http://www.foo.com"),
- "Y=a; path=/; expires=Mon, 18-Apr-22 22:50:14 GMT",
+ "Y=a; path=/; expires=Mon, 18-Apr-62 22:50:14 GMT",
Time::Now() + base::Days(10), &initial_cookies);
// Inject our initial cookies into the mock PersistentCookieStore.
@@ -3177,7 +3176,7 @@ TEST_F(CookieMonsterTest, PersisentCookieStorageTest) {
// Add a cookie.
EXPECT_TRUE(SetCookie(cm.get(), http_www_foo_.url(),
- "A=B; expires=Mon, 18-Apr-22 22:50:13 GMT"));
+ "A=B; expires=Mon, 18-Apr-62 22:50:13 GMT"));
this->MatchCookieLines("A=B", GetCookies(cm.get(), http_www_foo_.url()));
ASSERT_EQ(1u, store->commands().size());
EXPECT_EQ(CookieStoreCommand::ADD, store->commands()[0].type);
@@ -3190,13 +3189,13 @@ TEST_F(CookieMonsterTest, PersisentCookieStorageTest) {
// Add a cookie.
EXPECT_TRUE(SetCookie(cm.get(), http_www_foo_.url(),
- "A=B; expires=Mon, 18-Apr-22 22:50:13 GMT"));
+ "A=B; expires=Mon, 18-Apr-62 22:50:13 GMT"));
this->MatchCookieLines("A=B", GetCookies(cm.get(), http_www_foo_.url()));
ASSERT_EQ(3u, store->commands().size());
EXPECT_EQ(CookieStoreCommand::ADD, store->commands()[2].type);
// Overwrite it.
EXPECT_TRUE(SetCookie(cm.get(), http_www_foo_.url(),
- "A=Foo; expires=Mon, 18-Apr-22 22:50:14 GMT"));
+ "A=Foo; expires=Mon, 18-Apr-62 22:50:14 GMT"));
this->MatchCookieLines("A=Foo", GetCookies(cm.get(), http_www_foo_.url()));
ASSERT_EQ(5u, store->commands().size());
EXPECT_EQ(CookieStoreCommand::REMOVE, store->commands()[3].type);
patches/net-cookies-cookie_store_unittest.h.patch
+130
View File
@@ -0,0 +1,130 @@
diff --git a/net/cookies/cookie_store_unittest.h b/net/cookies/cookie_store_unittest.h
index d71e3721bfde49ce91d84fb27aa256d90118802e..b1738b69be3f86ef47400d68e8c37a736e390de2 100644
--- a/net/cookies/cookie_store_unittest.h
+++ b/net/cookies/cookie_store_unittest.h
@@ -424,14 +424,14 @@ class CookieStoreTest : public testing::Test {
base::Milliseconds(
CookieStoreTestTraits::creation_time_granularity_in_ms);
- while (!matched && base::Time::Now() <= polling_end_date) {
+ while (!matched && base::Time::Now() <= polling_end_date) {
base::PlatformThread::Sleep(base::Milliseconds(10));
cookies = GetCookies(cs, url);
matched = (TokenizeCookieLine(line) == TokenizeCookieLine(cookies));
}
- EXPECT_TRUE(matched) << "\"" << cookies
- << "\" does not match \"" << line << "\"";
+ EXPECT_TRUE(matched) << "\"" << cookies << "\" does not match \"" << line
+ << "\"";
}
const CookieURLHelper http_www_foo_;
@@ -1393,7 +1393,7 @@ TYPED_TEST_P(CookieStoreTest, TestCookieDeletion) {
// Create a persistent cookie.
EXPECT_TRUE(this->SetCookie(
cs, this->http_www_foo_.url(),
- std::string(kValidCookieLine) + "; expires=Mon, 18-Apr-22 22:50:13 GMT"));
+ std::string(kValidCookieLine) + "; expires=Mon, 18-Apr-62 22:50:13 GMT"));
this->MatchCookieLines("A=B",
this->GetCookies(cs, this->http_www_foo_.url()));
@@ -1406,7 +1406,7 @@ TYPED_TEST_P(CookieStoreTest, TestCookieDeletion) {
// Create a persistent cookie.
EXPECT_TRUE(this->SetCookie(
cs, this->http_www_foo_.url(),
- std::string(kValidCookieLine) + "; expires=Mon, 18-Apr-22 22:50:13 GMT"));
+ std::string(kValidCookieLine) + "; expires=Mon, 18-Apr-62 22:50:13 GMT"));
this->MatchCookieLines("A=B",
this->GetCookies(cs, this->http_www_foo_.url()));
// Delete it via Expires.
@@ -1419,13 +1419,13 @@ TYPED_TEST_P(CookieStoreTest, TestCookieDeletion) {
// Create a persistent cookie.
EXPECT_TRUE(this->SetCookie(
cs, this->http_www_foo_.url(),
- std::string(kValidCookieLine) + "; expires=Mon, 18-Apr-22 22:50:13 GMT"));
+ std::string(kValidCookieLine) + "; expires=Mon, 18-Apr-62 22:50:13 GMT"));
this->MatchCookieLines("A=B",
this->GetCookies(cs, this->http_www_foo_.url()));
// Check that it is not deleted with significant enough clock skew.
base::Time server_time;
- EXPECT_TRUE(base::Time::FromString("Sun, 17-Apr-1977 22:50:13 GMT",
- &server_time));
+ EXPECT_TRUE(
+ base::Time::FromString("Sun, 17-Apr-1977 22:50:13 GMT", &server_time));
EXPECT_TRUE(this->SetCookieWithServerTime(
cs, this->http_www_foo_.url(),
std::string(kValidCookieLine) + "; expires=Mon, 18-Apr-1977 22:50:13 GMT",
@@ -1436,7 +1436,7 @@ TYPED_TEST_P(CookieStoreTest, TestCookieDeletion) {
// Create a persistent cookie.
EXPECT_TRUE(this->SetCookie(
cs, this->http_www_foo_.url(),
- std::string(kValidCookieLine) + "; expires=Mon, 18-Apr-22 22:50:13 GMT"));
+ std::string(kValidCookieLine) + "; expires=Mon, 18-Apr-62 22:50:13 GMT"));
this->MatchCookieLines("A=B",
this->GetCookies(cs, this->http_www_foo_.url()));
// Delete it via Expires, with a unix epoch of 0.
@@ -1456,7 +1456,7 @@ TYPED_TEST_P(CookieStoreTest, TestDeleteAll) {
// Set a persistent cookie.
EXPECT_TRUE(this->SetCookie(cs, this->http_www_foo_.url(),
- "C=D; expires=Mon, 18-Apr-22 22:50:13 GMT"));
+ "C=D; expires=Mon, 18-Apr-62 22:50:13 GMT"));
EXPECT_EQ(2u, this->GetAllCookies(cs).size());
@@ -1602,12 +1602,12 @@ TYPED_TEST_P(CookieStoreTest, OverwritePersistentCookie) {
// Insert a cookie "a" for path "/path1"
EXPECT_TRUE(this->SetCookie(cs, url_foo,
"a=val1; path=/path1; "
- "expires=Mon, 18-Apr-22 22:50:13 GMT"));
+ "expires=Mon, 18-Apr-62 22:50:13 GMT"));
// Insert a cookie "b" for path "/path1"
EXPECT_TRUE(this->SetCookie(cs, url_foo,
"b=val1; path=/path1; "
- "expires=Mon, 18-Apr-22 22:50:14 GMT"));
+ "expires=Mon, 18-Apr-62 22:50:14 GMT"));
// Insert a cookie "b" for path "/path1", that is httponly. This should
// overwrite the non-http-only version.
@@ -1617,26 +1617,26 @@ TYPED_TEST_P(CookieStoreTest, OverwritePersistentCookie) {
net::CookieOptions::SameSiteCookieContext::MakeInclusive());
EXPECT_TRUE(this->CreateAndSetCookie(cs, url_foo,
"b=val2; path=/path1; httponly; "
- "expires=Mon, 18-Apr-22 22:50:14 GMT",
+ "expires=Mon, 18-Apr-62 22:50:14 GMT",
allow_httponly));
// Insert a cookie "a" for path "/path1". This should overwrite.
EXPECT_TRUE(this->SetCookie(cs, url_foo,
"a=val33; path=/path1; "
- "expires=Mon, 18-Apr-22 22:50:14 GMT"));
+ "expires=Mon, 18-Apr-62 22:50:14 GMT"));
// Insert a cookie "a" for path "/path2". This should NOT overwrite
// cookie "a", since the path is different.
EXPECT_TRUE(this->SetCookie(cs, url_foo,
"a=val9; path=/path2; "
- "expires=Mon, 18-Apr-22 22:50:14 GMT"));
+ "expires=Mon, 18-Apr-62 22:50:14 GMT"));
// Insert a cookie "a" for path "/path1", but this time for "chromium.org".
// Although the name and path match, the hostnames do not, so shouldn't
// overwrite.
EXPECT_TRUE(this->SetCookie(cs, url_chromium,
"a=val99; path=/path1; "
- "expires=Mon, 18-Apr-22 22:50:14 GMT"));
+ "expires=Mon, 18-Apr-62 22:50:14 GMT"));
if (TypeParam::supports_http_only) {
this->MatchCookieLines(
@@ -1871,7 +1871,7 @@ TYPED_TEST_P(CookieStoreTest, DeleteSessionCookie) {
EXPECT_TRUE(this->SetCookie(
cs, this->http_www_foo_.url(),
this->http_www_foo_.Format("C=D; path=/; domain=%D;"
- "expires=Mon, 18-Apr-22 22:50:13 GMT")));
+ "expires=Mon, 18-Apr-62 22:50:13 GMT")));
this->MatchCookieLines("A=B; C=D",
this->GetCookies(cs, this->http_www_foo_.url()));
// Delete the session cookie.
patches/third_party-blink-renderer-modules-mediastream-media_devices.cc.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/third_party/blink/renderer/modules/mediastream/media_devices.cc b/third_party/blink/renderer/modules/mediastream/media_devices.cc
index fe01909b686d8526ce7cec4c857448391305249d..ee5cea78614c4232b216b5963c099510b13d3f6d 100644
index 3d25ca464c23cf835bdbc7347bbac62485374097..3f9ab46563490ca2736957e786b3cc65ab122f68 100644
--- a/third_party/blink/renderer/modules/mediastream/media_devices.cc
+++ b/third_party/blink/renderer/modules/mediastream/media_devices.cc
@@ -669,6 +669,8 @@ 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 77d0a26dbf4d178d2d6c625367ba2eee10788dc1..6291e511c3dfb8f058f02349b1884c34cb31dc4b 100644
index 3824be8a73a8ee7dac1da9d306ee1a53368d28fb..7b654a9eeabb252251b924908073d5971c00e9ab 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
@@ -5297,6 +5297,7 @@ ScriptValue WebGL2RenderingContextBase::getParameter(ScriptState* script_state,
@@ -5305,6 +5305,7 @@ ScriptValue WebGL2RenderingContextBase::getParameter(ScriptState* script_state,
GLenum pname) {
if (isContextLost())
return ScriptValue::CreateNull(script_state->GetIsolate());
@@ -10,7 +10,7 @@ index 77d0a26dbf4d178d2d6c625367ba2eee10788dc1..6291e511c3dfb8f058f02349b1884c34
switch (pname) {
case GL_SHADING_LANGUAGE_VERSION: {
return WebGLAny(
@@ -5840,6 +5841,7 @@ ScriptValue WebGL2RenderingContextBase::getFramebufferAttachmentParameter(
@@ -5848,6 +5849,7 @@ ScriptValue WebGL2RenderingContextBase::getFramebufferAttachmentParameter(
if (isContextLost() || !ValidateGetFramebufferAttachmentParameterFunc(
kFunctionName, target, attachment))
return ScriptValue::CreateNull(script_state->GetIsolate());
@@ -18,7 +18,7 @@ index 77d0a26dbf4d178d2d6c625367ba2eee10788dc1..6291e511c3dfb8f058f02349b1884c34
WebGLFramebuffer* framebuffer_binding = GetFramebufferBinding(target);
DCHECK(!framebuffer_binding || framebuffer_binding->Object());
@@ -6052,6 +6054,7 @@ ScriptValue WebGL2RenderingContextBase::getTexParameter(
@@ -6060,6 +6062,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
+1 -1
View File
@@ -1,5 +1,5 @@
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 5fea26ba26cc7df3a26fe317bee7ee4878e1163f..83a553c156b984a84c988f005e2053d8914265e3 100644
index a8f006a10920ab53e398e3d5f178f801586dbb34..ec5adfdade29b004542982364a4cbc89c294cf46 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
@@ -3032,6 +3032,7 @@ WebGLActiveInfo* WebGLRenderingContextBase::getActiveAttrib(
patches/tools-gritsettings-resource_ids.spec.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/tools/gritsettings/resource_ids.spec b/tools/gritsettings/resource_ids.spec
index b036986b35dac88ab58d572a9e77bf0b1210411a..71f9ebadaa1a2333c2d3663a0376a85e8c64d477 100644
index 6a91282809a76ca60dd1b329c683705b127eb22a..90686384bbef18be9fef1ba58778791058bc35b4 100644
--- a/tools/gritsettings/resource_ids.spec
+++ b/tools/gritsettings/resource_ids.spec
@@ -41,6 +41,9 @@
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 031fecd5a06d039256a8454f555600ad3ffa7533..4ad24a1de5c851b9ff88ff1efec9c8acbe76c21e 100644
index 58a674749bb2262ab6ef227257115656aac42e79..2a08a089d5c68c4562064df9a9f56cbac98003c6 100644
--- a/tools/metrics/histograms/metadata/histogram_suffixes_list.xml
+++ b/tools/metrics/histograms/metadata/histogram_suffixes_list.xml
@@ -7357,6 +7357,7 @@ chromium-metrics-reviews@google.com.
@@ -7339,6 +7339,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"/>