nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1769388 - Change nsIPrintSettingsService's 'newPrintSettings' attribute to a 'createNewPrintSettings' function. r=bobowen,webdriver-reviewers,whimboo

Browse source 
Having an attribute be a constructor is just...wrong.

Differential Revision: https://phabricator.services.mozilla.com/D146383
This commit is contained in:
Jonathan Watt 2022-05-16 11:50:34 +00:00
parent 6eb3ce5835
commit 6e5bce1349
18 changed files with 25 additions and 26 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

2
browser/components/extensions/parent/ext-tabs.js
View file

@ -1382,7 +1382,7 @@ this.tabs = class extends ExtensionAPIPersistent {
let psService = Cc[
"@mozilla.org/gfx/printsettings-service;1"
].getService(Ci.nsIPrintSettingsService);
let printSettings = psService.newPrintSettings;
let printSettings = psService.createNewPrintSettings();
printSettings.printerName = "";
printSettings.isInitializedFromPrinter = true;

3
docshell/base/CanonicalBrowsingContext.cpp
View file

@ -734,7 +734,8 @@ already_AddRefed<Promise> CanonicalBrowsingContext::Print(
nsresult rv;
nsCOMPtr<nsIPrintSettings> printSettings = aPrintSettings;
if (!printSettings) {
rv = printSettingsSvc->GetNewPrintSettings(getter_AddRefs(printSettings));
rv =
printSettingsSvc->CreateNewPrintSettings(getter_AddRefs(printSettings));
if (NS_WARN_IF(NS_FAILED(rv))) {
promise->MaybeReject(ErrorResult(rv));
return promise.forget();

8
dom/ipc/BrowserChild.cpp
View file

@ -1028,7 +1028,7 @@ nsresult BrowserChild::CloneDocumentTreeIntoSelf(
nsCOMPtr<nsIPrintSettings> printSettings;
nsresult rv =
printSettingsSvc->GetNewPrintSettings(getter_AddRefs(printSettings));
printSettingsSvc->CreateNewPrintSettings(getter_AddRefs(printSettings));
if (NS_WARN_IF(NS_FAILED(rv))) {
return rv;
}
@ -1096,7 +1096,7 @@ nsresult BrowserChild::UpdateRemotePrintSettings(
nsCOMPtr<nsIPrintSettings> printSettings;
nsresult rv =
printSettingsSvc->GetNewPrintSettings(getter_AddRefs(printSettings));
printSettingsSvc->CreateNewPrintSettings(getter_AddRefs(printSettings));
if (NS_WARN_IF(NS_FAILED(rv))) {
return rv;
}
@ -2455,7 +2455,7 @@ mozilla::ipc::IPCResult BrowserChild::RecvPrintPreview(
if (NS_WARN_IF(!printSettingsSvc)) {
return IPC_OK();
}
printSettingsSvc->GetNewPrintSettings(getter_AddRefs(printSettings));
printSettingsSvc->CreateNewPrintSettings(getter_AddRefs(printSettings));
if (NS_WARN_IF(!printSettings)) {
return IPC_OK();
}
@ -2511,7 +2511,7 @@ mozilla::ipc::IPCResult BrowserChild::RecvPrint(
nsCOMPtr<nsIPrintSettings> printSettings;
nsresult rv =
printSettingsSvc->GetNewPrintSettings(getter_AddRefs(printSettings));
printSettingsSvc->CreateNewPrintSettings(getter_AddRefs(printSettings));
if (NS_WARN_IF(NS_FAILED(rv))) {
return IPC_OK();
}

2
layout/base/tests/chrome/printpreview_bug396024_helper.xhtml
View file

@ -39,7 +39,7 @@ function printpreview() {
}
}
let settings = Cc["@mozilla.org/gfx/printsettings-service;1"]
.getService(Ci.nsIPrintSettingsService).newPrintSettings;
.getService(Ci.nsIPrintSettingsService).createNewPrintSettings();
gWbp.printPreview(settings, frameElts[0].contentWindow, listener);
}

2
layout/base/tests/chrome/printpreview_bug482976_helper.xhtml
View file

@ -40,7 +40,7 @@ function printpreview() {
}
let settings = Cc["@mozilla.org/gfx/printsettings-service;1"]
.getService(Ci.nsIPrintSettingsService).newPrintSettings;
.getService(Ci.nsIPrintSettingsService).createNewPrintSettings();
gPrintPreviewWin = frameElts[0].contentWindow.printPreview(settings, listener);
gWbp = gPrintPreviewWin.docShell.contentViewer;

2
layout/base/tests/chrome/printpreview_helper.xhtml
View file

@ -61,7 +61,7 @@ function printpreview(options = {}) {
}
}
var settings = Cc["@mozilla.org/gfx/printsettings-service;1"]
.getService(Ci.nsIPrintSettingsService).newPrintSettings;
.getService(Ci.nsIPrintSettingsService).createNewPrintSettings();
settings.printBGColors = true;
settings.headerStrLeft = "";
settings.headerStrRight = "";

2
layout/base/tests/chrome/test_get_printer_orientation.html
View file

@ -26,7 +26,7 @@ async function run() {
let defaultSettings = printerInfo.defaultSettings;
// Let the printer impose its defaults onto a fresh settings object:
let freshSettings = settingsSvc.newPrintSettings;
let freshSettings = settingsSvc.createNewPrintSettings();
printerList.initPrintSettingsFromPrinter(printer.name, freshSettings);
// Make sure they agree on the default orientation:

2
layout/tools/layout-debug/src/nsLayoutDebuggingTools.cpp
View file

@ -123,7 +123,7 @@ nsLayoutDebuggingTools::SetPagedMode(bool aPagedMode) {
do_GetService("@mozilla.org/gfx/printsettings-service;1");
nsCOMPtr<nsIPrintSettings> printSettings;
printSettingsService->GetNewPrintSettings(getter_AddRefs(printSettings));
printSettingsService->CreateNewPrintSettings(getter_AddRefs(printSettings));
// Use the same setup as setupPrintMode() in reftest-content.js.
printSettings->SetPaperWidth(5);

2
layout/tools/reftest/reftest-content.js
View file

@ -201,7 +201,7 @@ function doPrintMode(contentRootElement) {
function setupPrintMode() {
var PSSVC =
Cc[PRINTSETTINGS_CONTRACTID].getService(Ci.nsIPrintSettingsService);
var ps = PSSVC.newPrintSettings;
var ps = PSSVC.createNewPrintSettings();
ps.paperWidth = 5;
ps.paperHeight = 3;

2
layout/tools/reftest/reftest.jsm
View file

@ -1753,7 +1753,7 @@ function RecvStartPrint(isPrintSelection, printRange)
file.append(fileName);
let PSSVC = Cc["@mozilla.org/gfx/printsettings-service;1"].getService(Ci.nsIPrintSettingsService);
let ps = PSSVC.newPrintSettings;
let ps = PSSVC.createNewPrintSettings();
ps.printSilent = true;
ps.printBGImages = true;
ps.printBGColors = true;

2
remote/cdp/domains/parent/Page.jsm
View file

@ -569,7 +569,7 @@ class Page extends Domain {
Ci.nsIPrintSettingsService
);
const printSettings = psService.newPrintSettings;
const printSettings = psService.createNewPrintSettings();
printSettings.isInitializedFromPrinter = true;
printSettings.isInitializedFromPrefs = true;
printSettings.outputFormat = Ci.nsIPrintSettings.kOutputFormatPDF;

2
remote/shared/PDF.jsm
View file

@ -62,7 +62,7 @@ function getPrintSettings(settings, filePath) {
);
let cmToInches = cm => cm / 2.54;
const printSettings = psService.newPrintSettings;
const printSettings = psService.createNewPrintSettings();
printSettings.isInitializedFromPrinter = true;
printSettings.isInitializedFromPrefs = true;
printSettings.outputFormat = Ci.nsIPrintSettings.kOutputFormatPDF;

2
toolkit/components/printing/content/print.js
View file

@ -1193,7 +1193,7 @@ var PrintSettingsViewProxy = {
printerInfo.defaultSettings = basePrinterInfo.defaultSettings;
} else if (printerName == PrintUtils.SAVE_TO_PDF_PRINTER) {
// The Mozilla PDF pseudo-printer has no actual nsIPrinter implementation
printerInfo.defaultSettings = PSSVC.newPrintSettings;
printerInfo.defaultSettings = PSSVC.createNewPrintSettings();
printerInfo.defaultSettings.printerName = printerName;
printerInfo.defaultSettings.toFileName = "";
printerInfo.defaultSettings.outputFormat =

2
toolkit/components/printing/content/printUtils.js
View file

@ -545,7 +545,7 @@ var PrintUtils = {
).systemDefaultPrinterName;
})();
printSettings = PSSVC.newPrintSettings;
printSettings = PSSVC.createNewPrintSettings();
printSettings.printerName = printerName;
// First get any defaults from the printer. We want to skip this for Save

2
toolkit/components/printing/tests/browser_print_stream.js
View file

@ -13,7 +13,7 @@ async function printToDestination(aBrowser, aDestination) {
info(`Printing to ${filePath}`);
let settings = PSSVC.newPrintSettings;
let settings = PSSVC.createNewPrintSettings();
settings.outputFormat = Ci.nsIPrintSettings.kOutputFormatPDF;
settings.outputDestination = aDestination;

2
toolkit/components/printing/tests/head.js
View file

@ -288,7 +288,7 @@ class PrintHelper {
).fallbackPaperList;
}
let defaultSettings = PSSVC.newPrintSettings;
let defaultSettings = PSSVC.createNewPrintSettings();
defaultSettings.printerName = name;
defaultSettings.toFileName = "";
defaultSettings.outputFormat = Ci.nsIPrintSettings.kOutputFormatNative;

8
widget/nsIPrintSettingsService.idl
View file

@ -34,14 +34,12 @@ interface nsIPrintSettingsService : nsISupports
[noscript] readonly attribute nsIPrintSettings defaultPrintSettingsForPrinting;
/**
* Returns a new, unique PrintSettings object each time.
* Creates a new nsIPrintSettings object.
*
* Initializes the newPrintSettings from the unprefixed printer
* Initializes the settings object from the unprefixed printer
* (Note: this may not happen if there is an OS specific implementation.)
*
* XXX This should really be a function called `createPrintSettings()`.
*/
readonly attribute nsIPrintSettings newPrintSettings;
nsIPrintSettings createNewPrintSettings();
/**
* The name of the last printer used. Note that this may not be set, or may

4
widget/nsPrintSettingsService.cpp
View file

@ -766,7 +766,7 @@ nsresult nsPrintSettingsService::WritePrefs(nsIPrintSettings* aPS,
NS_IMETHODIMP
nsPrintSettingsService::GetDefaultPrintSettingsForPrinting(
nsIPrintSettings** aPrintSettings) {
nsresult rv = GetNewPrintSettings(aPrintSettings);
nsresult rv = CreateNewPrintSettings(aPrintSettings);
NS_ENSURE_SUCCESS(rv, rv);
nsIPrintSettings* settings = *aPrintSettings;
@ -783,7 +783,7 @@ nsPrintSettingsService::GetDefaultPrintSettingsForPrinting(
}
NS_IMETHODIMP
nsPrintSettingsService::GetNewPrintSettings(
nsPrintSettingsService::CreateNewPrintSettings(
nsIPrintSettings** aNewPrintSettings) {
return _CreatePrintSettings(aNewPrintSettings);
}