Skip to content

Commit 7b5acf6

Browse files
authored
[AUTO] Patches auto-rebase for 132.0.6834.163 (#1779)
[AUTO] Patches auto-rebase for 132.0.6834.163
2 parents e9dff23 + 9d6b1a4 commit 7b5acf6

6 files changed

+9
-9
lines changed

Diff for: build/patches/Ask-for-restart-on-connection-change.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -615,7 +615,7 @@ diff --git a/content/browser/web_contents/web_contents_android.h b/content/brows
615615
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
616616
--- a/content/browser/web_contents/web_contents_impl.cc
617617
+++ b/content/browser/web_contents/web_contents_impl.cc
618-
@@ -3676,8 +3676,10 @@ void WebContentsImpl::Stop() {
618+
@@ -3678,8 +3678,10 @@ void WebContentsImpl::Stop() {
619619
void WebContentsImpl::SetPageFrozen(bool frozen) {
620620
TRACE_EVENT1("content", "WebContentsImpl::SetPageFrozen", "frozen", frozen);
621621

Diff for: build/patches/Disable-speechSynthesis-getVoices-API.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer
4343
diff --git a/components/content_settings/renderer/content_settings_agent_impl.cc b/components/content_settings/renderer/content_settings_agent_impl.cc
4444
--- a/components/content_settings/renderer/content_settings_agent_impl.cc
4545
+++ b/components/content_settings/renderer/content_settings_agent_impl.cc
46-
@@ -476,6 +476,14 @@ void ContentSettingsAgentImpl::ClearBlockedContentSettings() {
46+
@@ -479,6 +479,14 @@ void ContentSettingsAgentImpl::ClearBlockedContentSettings() {
4747
cached_script_permissions_.clear();
4848
}
4949

@@ -58,7 +58,7 @@ diff --git a/components/content_settings/renderer/content_settings_agent_impl.cc
5858
bool ContentSettingsAgentImpl::UpdateOverrides() {
5959
// Evaluate the content setting rules
6060
ContentSetting setting = CONTENT_SETTING_ALLOW;
61-
@@ -486,7 +494,6 @@ bool ContentSettingsAgentImpl::UpdateOverrides() {
61+
@@ -489,7 +497,6 @@ bool ContentSettingsAgentImpl::UpdateOverrides() {
6262
}
6363
return UpdateTimeZoneOverride(
6464
setting, content_setting_rules_->timezone_override_value);

Diff for: build/patches/Revert-remove-allowscript-content-setting-secondary-url.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ diff --git a/components/content_settings/renderer/content_settings_agent_impl.cc
9090

9191
blink::WebLocalFrame* frame = render_frame()->GetWebFrame();
9292
if (frame->Parent())
93-
@@ -377,6 +377,41 @@ bool ContentSettingsAgentImpl::AllowImage(bool enabled_per_settings,
93+
@@ -380,6 +380,41 @@ bool ContentSettingsAgentImpl::AllowImage(bool enabled_per_settings,
9494
return allow;
9595
}
9696

@@ -132,7 +132,7 @@ diff --git a/components/content_settings/renderer/content_settings_agent_impl.cc
132132
bool ContentSettingsAgentImpl::AllowReadFromClipboard() {
133133
return delegate_->AllowReadFromClipboard();
134134
}
135-
@@ -435,6 +470,7 @@ void ContentSettingsAgentImpl::DidNotAllowImage() {
135+
@@ -438,6 +473,7 @@ void ContentSettingsAgentImpl::DidNotAllowImage() {
136136
void ContentSettingsAgentImpl::ClearBlockedContentSettings() {
137137
content_blocked_.clear();
138138
cached_storage_permissions_.clear();

Diff for: build/patches/Site-setting-for-images.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ diff --git a/components/content_settings/core/browser/content_settings_registry.
271271
diff --git a/components/content_settings/renderer/content_settings_agent_impl.cc b/components/content_settings/renderer/content_settings_agent_impl.cc
272272
--- a/components/content_settings/renderer/content_settings_agent_impl.cc
273273
+++ b/components/content_settings/renderer/content_settings_agent_impl.cc
274-
@@ -362,6 +362,21 @@ bool ContentSettingsAgentImpl::AllowStorageAccessSync(
274+
@@ -365,6 +365,21 @@ bool ContentSettingsAgentImpl::AllowStorageAccessSync(
275275
return result;
276276
}
277277

Diff for: build/patches/Timezone-customization.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -853,7 +853,7 @@ diff --git a/components/content_settings/renderer/content_settings_agent_impl.cc
853853

854854
blink::WebLocalFrame* frame = render_frame()->GetWebFrame();
855855
if (frame->Parent())
856-
@@ -473,4 +476,78 @@ void ContentSettingsAgentImpl::ClearBlockedContentSettings() {
856+
@@ -476,4 +479,78 @@ void ContentSettingsAgentImpl::ClearBlockedContentSettings() {
857857
cached_script_permissions_.clear();
858858
}
859859

Diff for: build/patches/User-agent-customization.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -1281,7 +1281,7 @@ diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser
12811281
#include "base/base_switches.h"
12821282
#include "base/check_op.h"
12831283
#include "base/command_line.h"
1284-
@@ -2311,8 +2312,6 @@ void WebContentsImpl::SetUserAgentOverride(
1284+
@@ -2313,8 +2314,6 @@ void WebContentsImpl::SetUserAgentOverride(
12851285
OPTIONAL_TRACE_EVENT2("content", "WebContentsImpl::SetUserAgentOverride",
12861286
"ua_override", ua_override.ua_string_override,
12871287
"override_in_new_tabs", override_in_new_tabs);
@@ -1290,7 +1290,7 @@ diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser
12901290

12911291
if (GetUserAgentOverride() == ua_override) {
12921292
return;
1293-
@@ -3457,6 +3456,9 @@ const blink::web_pref::WebPreferences WebContentsImpl::ComputeWebPreferences() {
1293+
@@ -3459,6 +3458,9 @@ const blink::web_pref::WebPreferences WebContentsImpl::ComputeWebPreferences() {
12941294
#else
12951295
prefs.viewport_meta_enabled = false;
12961296
#endif

0 commit comments

Comments
 (0)