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

fix: silent printing of PDFs with webContents.print (#47397)

Browse source 
fix: silent printing

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] 2025-06-07 07:59:50 +02:00 • committed by GitHub
commit dd0fb7d24d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
patches/chromium/printing.patch
View file

@ -666,7 +666,7 @@ index 6809c4576c71bc1e1a6ad4e0a37707272a9a10f4..3aad10424a6a31dab2ca393d00149ec6
PrintingFailed(int32 cookie, PrintFailureReason reason); PrintingFailed(int32 cookie, PrintFailureReason reason);
diff --git a/components/printing/renderer/print_render_frame_helper.cc b/components/printing/renderer/print_render_frame_helper.cc diff --git a/components/printing/renderer/print_render_frame_helper.cc b/components/printing/renderer/print_render_frame_helper.cc
index 774392650ad07ee56cb931db7d1a46eaedb1eaa1..d42afb1a744113af660aadc832c71244b8918090 100644 index 774392650ad07ee56cb931db7d1a46eaedb1eaa1..348ba6b23e3dc83196137ef07dc2543830471584 100644
--- a/components/printing/renderer/print_render_frame_helper.cc --- a/components/printing/renderer/print_render_frame_helper.cc
+++ b/components/printing/renderer/print_render_frame_helper.cc +++ b/components/printing/renderer/print_render_frame_helper.cc
@@ -52,6 +52,7 @@ @@ -52,6 +52,7 @@
@ -744,7 +744,7 @@ index 774392650ad07ee56cb931db7d1a46eaedb1eaa1..d42afb1a744113af660aadc832c71244
print_preview_context_.OnPrintPreview(); print_preview_context_.OnPrintPreview();
#if BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_CHROMEOS)
@@ -2075,17 +2081,19 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) { @@ -2075,17 +2081,25 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame, void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
const blink::WebNode& node, const blink::WebNode& node,
@ -759,6 +759,12 @@ index 774392650ad07ee56cb931db7d1a46eaedb1eaa1..d42afb1a744113af660aadc832c71244
FrameReference frame_ref(frame); FrameReference frame_ref(frame);
- if (!InitPrintSettings(frame, node)) { - if (!InitPrintSettings(frame, node)) {
+ // If we're silently printing a PDF, we bypass settings logic
+ // that sets modifiability to false so ensure it's set here.
+ if (silent && IsPrintingPdfFrame(frame, node)) {
+ settings.Set(kSettingPreviewModifiable, false);
+ }
+
+ if (!InitPrintSettings(frame, node, std::move(settings))) { + if (!InitPrintSettings(frame, node, std::move(settings))) {
// Browser triggered this code path. It already knows about the failure. // Browser triggered this code path. It already knows about the failure.
notify_browser_of_print_failure_ = false; notify_browser_of_print_failure_ = false;
@ -767,7 +773,7 @@ index 774392650ad07ee56cb931db7d1a46eaedb1eaa1..d42afb1a744113af660aadc832c71244
DidFinishPrinting(PrintingResult::kFailPrintInit); DidFinishPrinting(PrintingResult::kFailPrintInit);
return; return;
} }
@@ -2106,8 +2114,15 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame, @@ -2106,8 +2120,15 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
print_pages_params_->params->print_scaling_option; print_pages_params_->params->print_scaling_option;
auto self = weak_ptr_factory_.GetWeakPtr(); auto self = weak_ptr_factory_.GetWeakPtr();
@ -784,7 +790,7 @@ index 774392650ad07ee56cb931db7d1a46eaedb1eaa1..d42afb1a744113af660aadc832c71244
// Check if `this` is still valid. // Check if `this` is still valid.
if (!self) if (!self)
return; return;
@@ -2375,29 +2390,43 @@ void PrintRenderFrameHelper::IPCProcessed() { @@ -2375,29 +2396,43 @@ void PrintRenderFrameHelper::IPCProcessed() {
} }
bool PrintRenderFrameHelper::InitPrintSettings(blink::WebLocalFrame* frame, bool PrintRenderFrameHelper::InitPrintSettings(blink::WebLocalFrame* frame,