mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

fix: blank page when printing pdf (#43327)

Browse source 
Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
This commit is contained in:
trop[bot] 2024-08-15 10:30:22 -04:00 • committed by GitHub
parent bd70c3a740
commit a959476dc2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 92 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

18
shell/browser/api/electron_api_web_contents.cc
View file

@ -2906,11 +2906,7 @@ void WebContents::OnGetDeviceNameToUse(
if (!print_view_manager)
return;
auto* focused_frame = web_contents()->GetFocusedFrame();
auto* rfh = focused_frame && focused_frame->HasSelection()
? focused_frame
: web_contents()->GetPrimaryMainFrame();
content::RenderFrameHost* rfh = GetRenderFrameHostToUse(web_contents());
print_view_manager->PrintNow(rfh, std::move(print_settings),
std::move(print_callback));
}
@ -3107,12 +3103,13 @@ v8::Local<v8::Promise> WebContents::PrintToPDF(const base::Value& settings) {
auto generate_document_outline =
settings.GetDict().FindBool("generateDocumentOutline");
content::RenderFrameHost* rfh = GetRenderFrameHostToUse(web_contents());
absl::variant<printing::mojom::PrintPagesParamsPtr, std::string>
print_pages_params = print_to_pdf::GetPrintPagesParams(
web_contents()->GetPrimaryMainFrame()->GetLastCommittedURL(),
landscape, display_header_footer, print_background, scale,
paper_width, paper_height, margin_top, margin_bottom, margin_left,
margin_right, std::make_optional(header_template),
rfh->GetLastCommittedURL(), landscape, display_header_footer,
print_background, scale, paper_width, paper_height, margin_top,
margin_bottom, margin_left, margin_right,
std::make_optional(header_template),
std::make_optional(footer_template), prefer_css_page_size,
generate_tagged_pdf, generate_document_outline);
@ -3132,8 +3129,7 @@ v8::Local<v8::Promise> WebContents::PrintToPDF(const base::Value& settings) {
absl::get<printing::mojom::PrintPagesParamsPtr>(print_pages_params));
params->params->document_cookie = unique_id.value_or(0);
manager->PrintToPdf(web_contents()->GetPrimaryMainFrame(), page_ranges,
std::move(params),
manager->PrintToPdf(rfh, page_ranges, std::move(params),
base::BindOnce(&WebContents::OnPDFCreated, GetWeakPtr(),
std::move(promise)));