[AUTO] Patches auto-rebase
This commit is contained in:
committed by
github-actions[bot]
parent
baf72ad3f0
commit
eff32b5313
@@ -126,7 +126,7 @@ diff --git a/content/browser/network/reporting_service_proxy.cc b/content/browse
|
||||
diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
|
||||
--- a/content/browser/renderer_host/render_frame_host_impl.cc
|
||||
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
|
||||
@@ -15702,12 +15702,6 @@ void RenderFrameHostImpl::MaybeGenerateCrashReport(
|
||||
@@ -15703,12 +15703,6 @@ void RenderFrameHostImpl::MaybeGenerateCrashReport(
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -25,7 +25,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
|
||||
diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
|
||||
--- a/content/browser/renderer_host/render_frame_host_impl.cc
|
||||
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
|
||||
@@ -4966,7 +4966,17 @@ void RenderFrameHostImpl::SetLastCommittedOrigin(
|
||||
@@ -4967,7 +4967,17 @@ void RenderFrameHostImpl::SetLastCommittedOrigin(
|
||||
}
|
||||
|
||||
void RenderFrameHostImpl::SetInheritedBaseUrl(const GURL& inherited_base_url) {
|
||||
|
||||
@@ -407,7 +407,7 @@ diff --git a/content/browser/attribution_reporting/attribution_storage_sql.cc b/
|
||||
diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
|
||||
--- a/content/browser/renderer_host/render_frame_host_impl.cc
|
||||
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
|
||||
@@ -10241,6 +10241,7 @@ bool RenderFrameHostImpl::IsFencedFrameReportingFromRendererAllowed(
|
||||
@@ -10242,6 +10242,7 @@ bool RenderFrameHostImpl::IsFencedFrameReportingFromRendererAllowed(
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -415,7 +415,7 @@ diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/b
|
||||
if (!IsActive()) {
|
||||
// reportEvent is not allowed when this RenderFrameHost or one of its
|
||||
// ancestors is not active.
|
||||
@@ -14045,6 +14046,16 @@ void RenderFrameHostImpl::BindTrustTokenQueryAnswerer(
|
||||
@@ -14046,6 +14047,16 @@ void RenderFrameHostImpl::BindTrustTokenQueryAnswerer(
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@@ -31,7 +31,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
|
||||
diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
|
||||
--- a/content/browser/renderer_host/render_frame_host_impl.cc
|
||||
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
|
||||
@@ -15650,6 +15650,7 @@ void RenderFrameHostImpl::OnSameDocumentCommitProcessed(
|
||||
@@ -15651,6 +15651,7 @@ void RenderFrameHostImpl::OnSameDocumentCommitProcessed(
|
||||
void RenderFrameHostImpl::MaybeGenerateCrashReport(
|
||||
base::TerminationStatus status,
|
||||
int exit_code) {
|
||||
|
||||
@@ -52294,7 +52294,7 @@ diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/b
|
||||
|
||||
#include "content/browser/renderer_host/render_frame_host_impl.h"
|
||||
|
||||
@@ -3458,6 +3462,12 @@ void RenderFrameHostImpl::ExecuteJavaScriptMethod(
|
||||
@@ -3459,6 +3463,12 @@ void RenderFrameHostImpl::ExecuteJavaScriptMethod(
|
||||
std::move(callback));
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user