зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1551609
. Follow-up to mark PrintUtils.enterPrintPreview internal. r=mconley
--HG-- extra : rebase_source : a4a13dcc3fd6557ec2f896c3997c59a9836a72be extra : amend_source : cdf22cf67d557f21339b579e0f782f9c1730d4ef
This commit is contained in:
Родитель
b5e0d26baa
Коммит
d06b81ce65
|
@ -189,7 +189,7 @@ var PrintUtils = {
|
||||||
printPreviewTB.disableUpdateTriggers(true);
|
printPreviewTB.disableUpdateTriggers(true);
|
||||||
|
|
||||||
// collapse the browser here -- it will be shown in
|
// collapse the browser here -- it will be shown in
|
||||||
// enterPrintPreview; this forces a reflow which fixes display
|
// _enterPrintPreview; this forces a reflow which fixes display
|
||||||
// issues in bug 267422.
|
// issues in bug 267422.
|
||||||
// We use the print preview browser as the source browser to avoid
|
// We use the print preview browser as the source browser to avoid
|
||||||
// re-initializing print preview with a document that might now have changed.
|
// re-initializing print preview with a document that might now have changed.
|
||||||
|
@ -227,10 +227,10 @@ var PrintUtils = {
|
||||||
// this tells us whether we should continue on with PP or
|
// this tells us whether we should continue on with PP or
|
||||||
// wait for the callback via the observer
|
// wait for the callback via the observer
|
||||||
if (!notifyOnOpen.value.valueOf() || this._webProgressPP.value == null) {
|
if (!notifyOnOpen.value.valueOf() || this._webProgressPP.value == null) {
|
||||||
this.enterPrintPreview();
|
this._enterPrintPreview();
|
||||||
}
|
}
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
this.enterPrintPreview();
|
this._enterPrintPreview();
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
|
@ -396,7 +396,7 @@ var PrintUtils = {
|
||||||
}
|
}
|
||||||
|
|
||||||
// delay the print preview to show the content of the progress dialog
|
// delay the print preview to show the content of the progress dialog
|
||||||
setTimeout(function() { PrintUtils.enterPrintPreview(); }, 0);
|
setTimeout(function() { PrintUtils._enterPrintPreview(); }, 0);
|
||||||
},
|
},
|
||||||
|
|
||||||
QueryInterface: ChromeUtils.generateQI(["nsIObserver",
|
QueryInterface: ChromeUtils.generateQI(["nsIObserver",
|
||||||
|
@ -425,7 +425,7 @@ var PrintUtils = {
|
||||||
_ppBrowsers: new Set(),
|
_ppBrowsers: new Set(),
|
||||||
_currentPPBrowser: null,
|
_currentPPBrowser: null,
|
||||||
|
|
||||||
enterPrintPreview() {
|
_enterPrintPreview() {
|
||||||
// Send a message to the print preview browser to initialize
|
// Send a message to the print preview browser to initialize
|
||||||
// print preview. If we happen to have gotten a print preview
|
// print preview. If we happen to have gotten a print preview
|
||||||
// progress listener from nsIPrintingPromptService.showPrintProgressDialog
|
// progress listener from nsIPrintingPromptService.showPrintProgressDialog
|
||||||
|
|
Загрузка…
Ссылка в новой задаче