github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

chore: cherry-pick 30261f9de11e from chromium (#26204)

Browse Source
This commit is contained in:
Jeremy Rose
2020-10-28 15:42:29 -07:00
committed by GitHub
parent 305d623570
commit f3af287d4a
2 changed files with 30 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
patches/chromium/.patches
View File

@@ -144,6 +144,7 @@ cherry-pick-f06a6cb3a38e.patch
reland_add_more_checks_for_chrome_debugger_extensions.patch
cherry-pick-8629cd7f8af3.patch
fix_use_electron_generated_resources.patch
cherry-pick-30261f9de11e.patch
cherry-pick-88f263f401b4.patch
cherry-pick-229fdaf8fc05.patch
cherry-pick-1ed869ad4bb3.patch

29
patches/chromium/cherry-pick-30261f9de11e.patch Normal file
View File

@@ -0,0 +1,29 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Lei Zhang <thestig@chromium.org>
Date: Thu, 1 Oct 2020 19:18:54 +0000
Subject: Check RF is alive In PrintRenderFrameHelper::PreviewPageRendered().
Do not take an accessibility snapshot if the RenderFrame is gone.
Bug: 1133983
Change-Id: I612cc72936a1dcedc5180c24eae067e47237b09b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2442375
Reviewed-by: Dominic Mazzoni <dmazzoni@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#812851}
diff --git a/components/printing/renderer/print_render_frame_helper.cc b/components/printing/renderer/print_render_frame_helper.cc
index 9dd56e9df0d91ccd1d6789e3b3f261a533d373e8..340c31dc77d719dcf37f23770f16ca9e64536b03 100644
--- a/components/printing/renderer/print_render_frame_helper.cc
+++ b/components/printing/renderer/print_render_frame_helper.cc
@@ -2403,6 +2403,10 @@ bool PrintRenderFrameHelper::PreviewPageRendered(
DCHECK(print_preview_context_.IsModifiable());
#if BUILDFLAG(ENABLE_TAGGED_PDF)
+ // Make sure the RenderFrame is alive before taking the snapshot.
+ if (render_frame_gone_)
+ snapshotter_.reset();
+
// For tagged PDF exporting, send a snapshot of the accessibility tree
// along with page 0. The accessibility tree contains the content for
// all of the pages of the main frame.