[AUTO] Patches auto-rebase

uazo · Nov 7, 2024 · 95346ca · 95346ca
1 parent 5595dbb
commit 95346ca
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/build/patches/Disable-speechSynthesis-getVoices-API.patch b/build/patches/Disable-speechSynthesis-getVoices-API.patch
@@ -43,7 +43,7 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer
 diff --git a/components/content_settings/renderer/content_settings_agent_impl.cc b/components/content_settings/renderer/content_settings_agent_impl.cc
 --- a/components/content_settings/renderer/content_settings_agent_impl.cc
 +++ b/components/content_settings/renderer/content_settings_agent_impl.cc
-@@ -473,6 +473,14 @@ void ContentSettingsAgentImpl::ClearBlockedContentSettings() {
+@@ -476,6 +476,14 @@ void ContentSettingsAgentImpl::ClearBlockedContentSettings() {
    cached_script_permissions_.clear();
  }
 
@@ -58,7 +58,7 @@ diff --git a/components/content_settings/renderer/content_settings_agent_impl.cc
  bool ContentSettingsAgentImpl::UpdateOverrides() {
    // Evaluate the content setting rules
    ContentSetting setting = CONTENT_SETTING_ALLOW;
-@@ -483,7 +491,6 @@ bool ContentSettingsAgentImpl::UpdateOverrides() {
+@@ -486,7 +494,6 @@ bool ContentSettingsAgentImpl::UpdateOverrides() {
    }
    return UpdateTimeZoneOverride(
        setting, content_setting_rules_->timezone_override_value);

diff --git a/build/patches/Revert-remove-allowscript-content-setting-secondary-url.patch b/build/patches/Revert-remove-allowscript-content-setting-secondary-url.patch
@@ -90,7 +90,7 @@ diff --git a/components/content_settings/renderer/content_settings_agent_impl.cc
 
    blink::WebLocalFrame* frame = render_frame()->GetWebFrame();
    if (frame->Parent())
-@@ -374,6 +374,41 @@ bool ContentSettingsAgentImpl::AllowImage(bool enabled_per_settings,
+@@ -377,6 +377,41 @@ bool ContentSettingsAgentImpl::AllowImage(bool enabled_per_settings,
    return allow;
  }
 
@@ -132,7 +132,7 @@ diff --git a/components/content_settings/renderer/content_settings_agent_impl.cc
  bool ContentSettingsAgentImpl::AllowReadFromClipboard() {
    return delegate_->AllowReadFromClipboard();
  }
-@@ -432,6 +467,7 @@ void ContentSettingsAgentImpl::DidNotAllowImage() {
+@@ -435,6 +470,7 @@ void ContentSettingsAgentImpl::DidNotAllowImage() {
  void ContentSettingsAgentImpl::ClearBlockedContentSettings() {
    content_blocked_.clear();
    cached_storage_permissions_.clear();

diff --git a/build/patches/Site-setting-for-images.patch b/build/patches/Site-setting-for-images.patch
@@ -271,7 +271,7 @@ diff --git a/components/content_settings/core/browser/content_settings_registry.
 diff --git a/components/content_settings/renderer/content_settings_agent_impl.cc b/components/content_settings/renderer/content_settings_agent_impl.cc
 --- a/components/content_settings/renderer/content_settings_agent_impl.cc
 +++ b/components/content_settings/renderer/content_settings_agent_impl.cc
-@@ -359,6 +359,21 @@ bool ContentSettingsAgentImpl::AllowStorageAccessSync(
+@@ -362,6 +362,21 @@ bool ContentSettingsAgentImpl::AllowStorageAccessSync(
    return result;
  }
 

diff --git a/build/patches/Timezone-customization.patch b/build/patches/Timezone-customization.patch
@@ -847,7 +847,7 @@ diff --git a/components/content_settings/renderer/content_settings_agent_impl.cc
 
    blink::WebLocalFrame* frame = render_frame()->GetWebFrame();
    if (frame->Parent())
-@@ -470,4 +473,78 @@ void ContentSettingsAgentImpl::ClearBlockedContentSettings() {
+@@ -473,4 +476,78 @@ void ContentSettingsAgentImpl::ClearBlockedContentSettings() {
    cached_script_permissions_.clear();
  }