Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-24 19:37:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1749598 p1 - Stop reading the last used printer name in content processes. r=emilio

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D150098
This commit is contained in:
Jonathan Watt 2022-07-18 14:34:27 +00:00
parent 7b2f38b3b3
commit c0ea877a65
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dom/base/nsGlobalWindowOuter.cpp
View File

@ -5138,6 +5138,7 @@ Nullable<WindowProxyHolder> nsGlobalWindowOuter::Print(
nsCOMPtr<nsIPrintSettings> ps = aPrintSettings;
if (!ps) {
// We shouldn't need this once bug 1776169 is fixed.
printSettingsService->GetDefaultPrintSettingsForPrinting(
getter_AddRefs(ps));
}

26
widget/nsPrintSettingsService.cpp
View File

@ -765,14 +765,24 @@ nsPrintSettingsService::GetDefaultPrintSettingsForPrinting(
nsIPrintSettings* settings = *aPrintSettings;
nsAutoString printerName;
settings->GetPrinterName(printerName);
if (printerName.IsEmpty()) {
GetLastUsedPrinterName(printerName);
settings->SetPrinterName(printerName);
// For security reasons, we don't pass the printer name to content processes.
// Once bug 1776169 is fixed, we can just assert that this is the parent
// process.
bool usePrinterName = XRE_IsParentProcess();
if (usePrinterName) {
nsAutoString printerName;
settings->GetPrinterName(printerName);
if (printerName.IsEmpty()) {
GetLastUsedPrinterName(printerName);
settings->SetPrinterName(printerName);
}
InitPrintSettingsFromPrinter(printerName, settings);
}
InitPrintSettingsFromPrinter(printerName, settings);
InitPrintSettingsFromPrefs(settings, true, nsIPrintSettings::kInitSaveAll);
InitPrintSettingsFromPrefs(settings, usePrinterName,
nsIPrintSettings::kInitSaveAll);
return NS_OK;
}
@ -785,6 +795,8 @@ nsPrintSettingsService::CreateNewPrintSettings(
NS_IMETHODIMP
nsPrintSettingsService::GetLastUsedPrinterName(
nsAString& aLastUsedPrinterName) {
MOZ_ASSERT(XRE_IsParentProcess());
aLastUsedPrinterName.Truncate();
Preferences::GetString(kPrinterName, aLastUsedPrinterName);
return NS_OK;