Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-18 07:45:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1662222. Don't spin a nested event loop in nsPrintJob::DoCommonPrint when called by extensions. r=emilio

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D89681
This commit is contained in:
Jonathan Watt 2020-09-10 00:12:48 +00:00
parent 1a57b0fbb0
commit 42f409de3c
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
layout/printing/nsPrintJob.cpp
View File

@ -651,26 +651,23 @@ nsresult nsPrintJob::DoCommonPrint(bool aIsPrintPreview,
// The dialog is not shown, but this means we don't need to access the printer
// driver from the child, which causes sandboxing issues.
if (!mIsCreatingPrintPreview || printingViaParent) {
bool printSilentOnSettings = false;
printData->mPrintSettings->GetPrintSilent(&printSilentOnSettings);
bool printSilently =
printSilentOnSettings || StaticPrefs::print_always_print_silent();
bool printSilently = false;
printData->mPrintSettings->GetPrintSilent(&printSilently);
if (StaticPrefs::print_always_print_silent()) {
printSilently = true;
}
// The new print UI does not need to enter ShowPrintDialog below to spin
// the event loop and fetch real printer settings from the parent process,
// since it always passes complete print settings. (In fact, trying to
// fetch them from the parent can cause crashes.) Here we check for that
// case so that we can avoid calling ShowPrintDialog below. To err on the
// safe side, we exclude the old UI and non-frontend callers
// (Extensions.tabs.saveAsPDF()) which set `printSilent` on the settings
// object.
// We should remove the exception for tabx.saveAsPDF soon:
// https://bugzilla.mozilla.org/show_bug.cgi?id=1662222
// Slightly longer term we'll remove the old print UI, and even change the
// check for `isInitializedFromPrinter` to a MOZ_DIAGNOSTIC_ASSERT.
// safe side, we exclude the old UI.
//
// TODO: We should MOZ_DIAGNOSTIC_ASSERT that GetIsInitializedFromPrinter
// returns true.
bool settingsAreComplete = false;
if (StaticPrefs::print_tab_modal_enabled() && !printSilentOnSettings) {
if (StaticPrefs::print_tab_modal_enabled()) {
printData->mPrintSettings->GetIsInitializedFromPrinter(
&settingsAreComplete);
}