Update patches from Chromium 110.0.5481.24 to Chromium 110.0.5481.29
This commit is contained in:
@@ -1,8 +1,8 @@
|
||||
diff --git a/components/content_settings/browser/page_specific_content_settings.cc b/components/content_settings/browser/page_specific_content_settings.cc
|
||||
index e2d4bb5bc1673dfc21e279371a9b2014902a9151..fb0a86a2e977cef9ac963f18a91116a1a4127e6c 100644
|
||||
index 1b221f81ebdab5b76315a5dc2b351f587cda9234..8155f35d429c8a49708a1d02a4f0478f3c50b132 100644
|
||||
--- a/components/content_settings/browser/page_specific_content_settings.cc
|
||||
+++ b/components/content_settings/browser/page_specific_content_settings.cc
|
||||
@@ -577,6 +577,7 @@ bool PageSpecificContentSettings::IsContentBlocked(
|
||||
@@ -589,6 +589,7 @@ bool PageSpecificContentSettings::IsContentBlocked(
|
||||
content_type == ContentSettingsType::ADS ||
|
||||
content_type == ContentSettingsType::SOUND ||
|
||||
content_type == ContentSettingsType::CLIPBOARD_READ_WRITE ||
|
||||
@@ -10,7 +10,7 @@ index e2d4bb5bc1673dfc21e279371a9b2014902a9151..fb0a86a2e977cef9ac963f18a91116a1
|
||||
content_type == ContentSettingsType::SENSORS ||
|
||||
content_type == ContentSettingsType::GEOLOCATION) {
|
||||
const auto& it = content_settings_status_.find(content_type);
|
||||
@@ -599,6 +600,7 @@ bool PageSpecificContentSettings::IsContentAllowed(
|
||||
@@ -611,6 +612,7 @@ bool PageSpecificContentSettings::IsContentAllowed(
|
||||
content_type != ContentSettingsType::MEDIASTREAM_CAMERA &&
|
||||
content_type != ContentSettingsType::MIDI_SYSEX &&
|
||||
content_type != ContentSettingsType::CLIPBOARD_READ_WRITE &&
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
diff --git a/BUILD.gn b/BUILD.gn
|
||||
index 19399e86e8181034287e6d7867d8a4f429ddc6a4..74013efdd46175f8ff3e2ff93972f9746b24153b 100644
|
||||
index c9fec31475d6c777183e911df6bef5214c0b765b..7de977bbcaad9c330bf04616909eb8bf72230c25 100644
|
||||
--- a/BUILD.gn
|
||||
+++ b/BUILD.gn
|
||||
@@ -648,6 +648,7 @@ config("internal_config_base") {
|
||||
@@ -10,7 +10,7 @@ index 19399e86e8181034287e6d7867d8a4f429ddc6a4..74013efdd46175f8ff3e2ff93972f974
|
||||
}
|
||||
|
||||
config("internal_config") {
|
||||
@@ -2680,6 +2681,7 @@ v8_header_set("v8_headers") {
|
||||
@@ -2682,6 +2683,7 @@ v8_header_set("v8_headers") {
|
||||
":cppgc_headers",
|
||||
":v8_version",
|
||||
]
|
||||
|
||||
Reference in New Issue
Block a user