[AUTO] Patches auto-rebase for 132.0.6834.163 (#1779)
[AUTO] Patches auto-rebase for 132.0.6834.163
This commit is contained in:
@@ -615,7 +615,7 @@ diff --git a/content/browser/web_contents/web_contents_android.h b/content/brows
|
||||
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
|
||||
--- a/content/browser/web_contents/web_contents_impl.cc
|
||||
+++ b/content/browser/web_contents/web_contents_impl.cc
|
||||
@@ -3676,8 +3676,10 @@ void WebContentsImpl::Stop() {
|
||||
@@ -3678,8 +3678,10 @@ void WebContentsImpl::Stop() {
|
||||
void WebContentsImpl::SetPageFrozen(bool frozen) {
|
||||
TRACE_EVENT1("content", "WebContentsImpl::SetPageFrozen", "frozen", frozen);
|
||||
|
||||
|
||||
@@ -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
|
||||
@@ -476,6 +476,14 @@ void ContentSettingsAgentImpl::ClearBlockedContentSettings() {
|
||||
@@ -479,6 +479,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;
|
||||
@@ -486,7 +494,6 @@ bool ContentSettingsAgentImpl::UpdateOverrides() {
|
||||
@@ -489,7 +497,6 @@ bool ContentSettingsAgentImpl::UpdateOverrides() {
|
||||
}
|
||||
return UpdateTimeZoneOverride(
|
||||
setting, content_setting_rules_->timezone_override_value);
|
||||
|
||||
@@ -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())
|
||||
@@ -377,6 +377,41 @@ bool ContentSettingsAgentImpl::AllowImage(bool enabled_per_settings,
|
||||
@@ -380,6 +380,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();
|
||||
}
|
||||
@@ -435,6 +470,7 @@ void ContentSettingsAgentImpl::DidNotAllowImage() {
|
||||
@@ -438,6 +473,7 @@ void ContentSettingsAgentImpl::DidNotAllowImage() {
|
||||
void ContentSettingsAgentImpl::ClearBlockedContentSettings() {
|
||||
content_blocked_.clear();
|
||||
cached_storage_permissions_.clear();
|
||||
|
||||
@@ -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
|
||||
@@ -362,6 +362,21 @@ bool ContentSettingsAgentImpl::AllowStorageAccessSync(
|
||||
@@ -365,6 +365,21 @@ bool ContentSettingsAgentImpl::AllowStorageAccessSync(
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
@@ -853,7 +853,7 @@ diff --git a/components/content_settings/renderer/content_settings_agent_impl.cc
|
||||
|
||||
blink::WebLocalFrame* frame = render_frame()->GetWebFrame();
|
||||
if (frame->Parent())
|
||||
@@ -473,4 +476,78 @@ void ContentSettingsAgentImpl::ClearBlockedContentSettings() {
|
||||
@@ -476,4 +479,78 @@ void ContentSettingsAgentImpl::ClearBlockedContentSettings() {
|
||||
cached_script_permissions_.clear();
|
||||
}
|
||||
|
||||
|
||||
@@ -1281,7 +1281,7 @@ diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser
|
||||
#include "base/base_switches.h"
|
||||
#include "base/check_op.h"
|
||||
#include "base/command_line.h"
|
||||
@@ -2311,8 +2312,6 @@ void WebContentsImpl::SetUserAgentOverride(
|
||||
@@ -2313,8 +2314,6 @@ void WebContentsImpl::SetUserAgentOverride(
|
||||
OPTIONAL_TRACE_EVENT2("content", "WebContentsImpl::SetUserAgentOverride",
|
||||
"ua_override", ua_override.ua_string_override,
|
||||
"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
|
||||
|
||||
if (GetUserAgentOverride() == ua_override) {
|
||||
return;
|
||||
@@ -3457,6 +3456,9 @@ const blink::web_pref::WebPreferences WebContentsImpl::ComputeWebPreferences() {
|
||||
@@ -3459,6 +3458,9 @@ const blink::web_pref::WebPreferences WebContentsImpl::ComputeWebPreferences() {
|
||||
#else
|
||||
prefs.viewport_meta_enabled = false;
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user