fix: ensure correct WebContents when checking PDFReadyToPrint (#43943)

* fix: ensure correct WebContents when checking PDFReadyToPrint

* test: fix paths on Windows
This commit is contained in:
Shelley Vohr 2024-09-26 16:54:13 +02:00 committed by GitHub
parent ddd45db6ca
commit da6ab92353
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 56 additions and 9 deletions

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();
}
}
}

View file

@ -5,6 +5,7 @@ import * as path from 'node:path';
import * as fs from 'node:fs';
import * as http from 'node:http';
import * as os from 'node:os';
import * as url from 'node:url';
import { BrowserWindow, ipcMain, webContents, session, app, BrowserView, WebContents } from 'electron/main';
import { closeAllWindows } from './lib/window-helpers';
import { ifdescribe, defer, waitUntil, listen, ifit } from './lib/spec-helpers';
@ -12,7 +13,6 @@ import { once } from 'node:events';
import { setTimeout } from 'node:timers/promises';
const fixturesPath = path.resolve(__dirname, 'fixtures');
const mainFixturesPath = path.resolve(__dirname, 'fixtures');
const features = process._linkedBinding('electron_common_features');
describe('webContents module', () => {
@ -1185,7 +1185,7 @@ describe('webContents module', () => {
}).to.throw('\'icon\' parameter is required');
expect(() => {
w.webContents.startDrag({ file: __filename, icon: path.join(mainFixturesPath, 'blank.png') });
w.webContents.startDrag({ file: __filename, icon: path.join(fixturesPath, 'blank.png') });
}).to.throw(/Failed to load image from path (.+)/);
});
});
@ -2496,6 +2496,43 @@ describe('webContents module', () => {
expect(pdfInfo.numPages).to.equal(2);
expect(containsText(pdfInfo.textContent, /Cat: The Ideal Pet/)).to.be.true();
});
it('from an existing pdf document in a WebView', async () => {
const win = new BrowserWindow({
show: false,
webPreferences: {
webviewTag: true
}
});
await win.loadURL('about:blank');
const webContentsCreated = once(app, 'web-contents-created') as Promise<[any, WebContents]>;
const src = url.format({
pathname: `${fixturesPath.replaceAll('\\', '/')}/cat.pdf`,
protocol: 'file',
slashes: true
});
await win.webContents.executeJavaScript(`
new Promise((resolve, reject) => {
const webview = new WebView()
webview.setAttribute('src', '${src}')
document.body.appendChild(webview)
webview.addEventListener('did-finish-load', () => {
resolve()
})
})
`);
const [, webContents] = await webContentsCreated;
await once(webContents, '-pdf-ready-to-print');
const data = await webContents.printToPDF({});
const pdfInfo = await readPDF(data);
expect(pdfInfo.numPages).to.equal(2);
expect(containsText(pdfInfo.textContent, /Cat: The Ideal Pet/)).to.be.true();
});
});
describe('PictureInPicture video', () => {