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

This commit is contained in:
Jeremy Rose
2020-10-28 14:01:24 -07:00
committed by GitHub
parent 9242fff9c2
commit fe28c5ba06
2 changed files with 30 additions and 0 deletions

View File

@@ -105,4 +105,5 @@ avoid_use-after-free.patch
don_t_create_providers_if_context_is_lost.patch
fix_use_electron_generated_resources.patch
chore_expose_v8_initialization_isolate_callbacks.patch
cherry-pick-30261f9de11e.patch
cherry-pick-88f263f401b4.patch

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 c0107f561f444d537735d4725c6dbecbcaf45226..1f7b7294aa5afb7f967ec260ab9f62d8b27d6827 100644
--- a/components/printing/renderer/print_render_frame_helper.cc
+++ b/components/printing/renderer/print_render_frame_helper.cc
@@ -2463,6 +2463,10 @@ bool PrintRenderFrameHelper::PreviewPageRendered(
"page_number", page_number);
#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.