From eff32b5313466c19096f48f3d884c38f9ca5abad Mon Sep 17 00:00:00 2001 From: uazo <29201891+uazo@users.noreply.github.com> Date: Wed, 19 Mar 2025 08:01:31 +0000 Subject: [PATCH] [AUTO] Patches auto-rebase --- build/patches/Allow-building-without-enable_reporting.patch | 2 +- build/patches/Block-leakage-of-urls-in-sandbox-iframes.patch | 2 +- build/patches/Disable-conversion-measurement-api.patch | 4 ++-- build/patches/Disable-crash-reporting.patch | 2 +- build/patches/eyeo-beta-118.0.5993.48-base.patch | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build/patches/Allow-building-without-enable_reporting.patch b/build/patches/Allow-building-without-enable_reporting.patch index b70484c8..26571b6c 100644 --- a/build/patches/Allow-building-without-enable_reporting.patch +++ b/build/patches/Allow-building-without-enable_reporting.patch @@ -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( } } } diff --git a/build/patches/Block-leakage-of-urls-in-sandbox-iframes.patch b/build/patches/Block-leakage-of-urls-in-sandbox-iframes.patch index f6e75c76..92b5e55d 100644 --- a/build/patches/Block-leakage-of-urls-in-sandbox-iframes.patch +++ b/build/patches/Block-leakage-of-urls-in-sandbox-iframes.patch @@ -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) { diff --git a/build/patches/Disable-conversion-measurement-api.patch b/build/patches/Disable-conversion-measurement-api.patch index f866c116..eaeb5e5e 100644 --- a/build/patches/Disable-conversion-measurement-api.patch +++ b/build/patches/Disable-conversion-measurement-api.patch @@ -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; } diff --git a/build/patches/Disable-crash-reporting.patch b/build/patches/Disable-crash-reporting.patch index 617259c9..59aafb0f 100644 --- a/build/patches/Disable-crash-reporting.patch +++ b/build/patches/Disable-crash-reporting.patch @@ -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) { diff --git a/build/patches/eyeo-beta-118.0.5993.48-base.patch b/build/patches/eyeo-beta-118.0.5993.48-base.patch index fa2e4783..b3ff595f 100644 --- a/build/patches/eyeo-beta-118.0.5993.48-base.patch +++ b/build/patches/eyeo-beta-118.0.5993.48-base.patch @@ -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)); }