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

fix: ensure correct WebContents when checking PDFReadyToPrint (32-x-y) (#44011)

Browse source 
* fix: ensure correct `WebContents` when checking `PDFReadyToPrint` (#43943)

* fix: ensure correct WebContents when checking PDFReadyToPrint

* test: fix paths on Windows

Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>

* Update spec/api-web-contents-spec.ts

Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>

Co-authored-by: Charles Kerr <charles@charleskerr.com>

---------

Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
Co-authored-by: Charles Kerr <charles@charleskerr.com>
This commit is contained in:
trop[bot] 2024-09-29 15:38:22 +02:00 • committed by GitHub
parent dad72f1925
commit e69f5bc850
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 58 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

24
shell/browser/electron_pdf_document_helper_client.cc
View file

@ -27,13 +27,23 @@ void ElectronPDFDocumentHelperClient::UpdateContentRestrictions(
// allowed there won't be a printing restriction passed, so we can use this
// second call to notify that the pdf document is ready to print.
if (!(content_restrictions & chrome_pdf::kContentRestrictionPrint)) {
content::WebContents* web_contents =
content::WebContents::FromRenderFrameHost(render_frame_host);
electron::api::WebContents* api_web_contents =
electron::api::WebContents::From(
web_contents->GetOutermostWebContents());
if (api_web_contents) {
api_web_contents->PDFReadyToPrint();
// It's a WebView - emit the event on the WebView webContents.
auto* guest_view = extensions::MimeHandlerViewGuest::FromRenderFrameHost(
render_frame_host);
if (guest_view) {
auto* gv_api_wc =
electron::api::WebContents::From(guest_view->embedder_web_contents());
if (gv_api_wc)
gv_api_wc->PDFReadyToPrint();
return;
}
auto* wc = content::WebContents::FromRenderFrameHost(render_frame_host);
if (wc) {
auto* api_wc =
electron::api::WebContents::From(wc->GetOuterWebContents());
if (api_wc)
api_wc->PDFReadyToPrint();
}
}
}