Filip/playwright
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

fix: speculative fix for hanging screenshotter when waiting for fonts

Browse source
This commit is contained in:
Max Schmitt 2024-06-14 00:25:32 +02:00
parent 8ea663aa64
commit 3fb6feeb4f
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
packages/playwright-core/src/server/screenshotter.ts
View file

@ -204,7 +204,7 @@ export class Screenshotter {
return this._queue.postTask(async () => { return this._queue.postTask(async () => {
progress.log('taking page screenshot'); progress.log('taking page screenshot');
const { viewportSize } = await this._originalViewportSize(progress); const { viewportSize } = await this._originalViewportSize(progress);
await this._preparePageForScreenshot(progress, options.style, options.caret !== 'initial', options.animations === 'disabled'); await this._preparePageForScreenshot(progress, this._page.mainFrame(), options.style, options.caret !== 'initial', options.animations === 'disabled');
progress.throwIfAborted(); // Avoid restoring after failure - should be done by cleanup. progress.throwIfAborted(); // Avoid restoring after failure - should be done by cleanup.
if (options.fullPage) { if (options.fullPage) {
@ -233,7 +233,7 @@ export class Screenshotter {
progress.log('taking element screenshot'); progress.log('taking element screenshot');
const { viewportSize } = await this._originalViewportSize(progress); const { viewportSize } = await this._originalViewportSize(progress);
await this._preparePageForScreenshot(progress, options.style, options.caret !== 'initial', options.animations === 'disabled'); await this._preparePageForScreenshot(progress, handle._frame, options.style, options.caret !== 'initial', options.animations === 'disabled');
progress.throwIfAborted(); // Do not do extra work. progress.throwIfAborted(); // Do not do extra work.
await handle._waitAndScrollIntoViewIfNeeded(progress, true /* waitForVisible */); await handle._waitAndScrollIntoViewIfNeeded(progress, true /* waitForVisible */);
@ -257,7 +257,7 @@ export class Screenshotter {
}); });
} }
async _preparePageForScreenshot(progress: Progress, screenshotStyle: string | undefined, hideCaret: boolean, disableAnimations: boolean) { async _preparePageForScreenshot(progress: Progress, frame: Frame, screenshotStyle: string | undefined, hideCaret: boolean, disableAnimations: boolean) {
if (disableAnimations) if (disableAnimations)
progress.log(' disabled all CSS animations'); progress.log(' disabled all CSS animations');
const syncAnimations = this._page._delegate.shouldToggleStyleSheetToSyncAnimations(); const syncAnimations = this._page._delegate.shouldToggleStyleSheetToSyncAnimations();
@ -266,9 +266,7 @@ export class Screenshotter {
})); }));
if (!process.env.PW_TEST_SCREENSHOT_NO_FONTS_READY) { if (!process.env.PW_TEST_SCREENSHOT_NO_FONTS_READY) {
progress.log('waiting for fonts to load...'); progress.log('waiting for fonts to load...');
await Promise.all(this._page.frames().map(async frame => { await frame.nonStallingEvaluateInExistingContext('document.fonts.ready', false, 'utility').catch(() => {});
await frame.nonStallingEvaluateInExistingContext('document.fonts.ready', false, 'utility').catch(() => {});
}));
progress.log('fonts loaded'); progress.log('fonts loaded');
} }
progress.cleanupWhenAborted(() => this._restorePageAfterScreenshot()); progress.cleanupWhenAborted(() => this._restorePageAfterScreenshot());