3644598: Make RenderFrameHost used for notification permission decision

https://chromium-review.googlesource.com/c/chromium/src/+/3644598
electron · Jun 3, 2022 · 014c4b9 · 014c4b9
1 parent f9a9aca
commit 014c4b9
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/patches/chromium/disable_color_correct_rendering.patch b/patches/chromium/disable_color_correct_rendering.patch
@@ -240,7 +240,7 @@ index 8ca8002b9680a5e1aa2280199fdb87cdcad15961..089e0e68292d9636973878b955204a6a
      sandbox::policy::switches::kGpuSandboxAllowSysVShm,
      sandbox::policy::switches::kGpuSandboxFailuresFatal,
 diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
-index f70eb1d963cb7b7ee8a7d893ef0d2c93ed45162f..a9b616fa8aa0c4963c8807c546f2fcf96d801b35 100644
+index badf9f1b75b929970c503843dc2733678effb118..ad783222126b4d86d28103bc052f8be67aa943d1 100644
 --- a/content/browser/renderer_host/render_process_host_impl.cc
 +++ b/content/browser/renderer_host/render_process_host_impl.cc
 @@ -200,6 +200,7 @@

diff --git a/patches/chromium/notification_provenance.patch b/patches/chromium/notification_provenance.patch
@@ -133,7 +133,7 @@ index 424fae79eb1c93f1fac293ae8fdeb6d067f523cc..6a2f074ad981deb15b46bd91b6d7eb5d
        const GURL& document_url,
        const WeakDocumentPtr& weak_document_ptr,
 diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
-index 8d0465d3135bb1a97e1708353f3b546263d2cea5..17ae8276a1cc10e0a05787193a2ce8025252f1b6 100644
+index 8d0465d3135bb1a97e1708353f3b546263d2cea5..acb485c6f1c1daf2759d6315d9edd533fb4a7ec9 100644
 --- a/content/browser/renderer_host/render_process_host_impl.cc
 +++ b/content/browser/renderer_host/render_process_host_impl.cc
 @@ -2058,8 +2058,9 @@ void RenderProcessHostImpl::CreateNotificationService(
@@ -148,6 +148,15 @@ index 8d0465d3135bb1a97e1708353f3b546263d2cea5..17ae8276a1cc10e0a05787193a2ce802
      return;
    }
 
+@@ -2067,7 +2068,7 @@ void RenderProcessHostImpl::CreateNotificationService(
+   RenderFrameHost* rfh = RenderFrameHost::FromID(GetID(), render_frame_id);
+   CHECK(rfh);
+   storage_partition_impl_->GetPlatformNotificationContext()->CreateService(
+-      this, origin, rfh->GetLastCommittedURL(), rfh->GetWeakDocumentPtr(),
++      this, rfh, origin, rfh->GetLastCommittedURL(), rfh->GetWeakDocumentPtr(),
+       std::move(receiver));
+ }
+
 diff --git a/content/public/browser/platform_notification_service.h b/content/public/browser/platform_notification_service.h
 index 9646cbeb31141e3518f51482801431f3a6010360..b13b6ab07b4931b892749c84879d9a6adb3bcb58 100644
 --- a/content/public/browser/platform_notification_service.h

diff --git a/patches/chromium/support_mixed_sandbox_with_zygote.patch b/patches/chromium/support_mixed_sandbox_with_zygote.patch
@@ -22,7 +22,7 @@ However, the patch would need to be reviewed by the security team, as it
 does touch a security-sensitive class.
 
 diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
-index 17ae8276a1cc10e0a05787193a2ce8025252f1b6..f70eb1d963cb7b7ee8a7d893ef0d2c93ed45162f 100644
+index acb485c6f1c1daf2759d6315d9edd533fb4a7ec9..badf9f1b75b929970c503843dc2733678effb118 100644
 --- a/content/browser/renderer_host/render_process_host_impl.cc
 +++ b/content/browser/renderer_host/render_process_host_impl.cc
 @@ -1751,9 +1751,15 @@ bool RenderProcessHostImpl::Init() {