зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1557681. Rename nsPrintJob::Cancelled() to Cancel(). r=bobowen
"Cancelled" sounds like it's a query and should return a bool. In fact this method sets state in response to a nsIWebBrowserPrint.cancel() being called. Differential Revision: https://phabricator.services.mozilla.com/D34137 --HG-- extra : rebase_source : 97797d906b84ed18a258881a31722179d50943f7 extra : amend_source : c0e1b61f13b2a8ccaec7cc995841948deabbe041
This commit is contained in:
Родитель
4a0c9a9c7e
Коммит
09d6c311f9
|
@ -3750,7 +3750,7 @@ nsDocumentViewer::GetCurrentPrintSettings(
|
|||
NS_IMETHODIMP
|
||||
nsDocumentViewer::Cancel() {
|
||||
NS_ENSURE_TRUE(mPrintJob, NS_ERROR_FAILURE);
|
||||
return mPrintJob->Cancelled();
|
||||
return mPrintJob->Cancel();
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
|
|
|
@ -640,7 +640,7 @@ bool nsPrintJob::CheckBeforeDestroy() {
|
|||
}
|
||||
|
||||
//-------------------------------------------------------
|
||||
nsresult nsPrintJob::Cancelled() {
|
||||
nsresult nsPrintJob::Cancel() {
|
||||
if (mPrt && mPrt->mPrintSettings) {
|
||||
return mPrt->mPrintSettings->SetIsCancelled(true);
|
||||
}
|
||||
|
|
|
@ -209,7 +209,7 @@ class nsPrintJob final : public nsIObserver,
|
|||
eDocTitleDefault aDefType);
|
||||
|
||||
bool CheckBeforeDestroy();
|
||||
nsresult Cancelled();
|
||||
nsresult Cancel();
|
||||
|
||||
mozilla::PresShell* GetPrintPreviewPresShell() {
|
||||
return mPrtPreview->mPrintObject->mPresShell;
|
||||
|
|
Загрузка…
Ссылка в новой задаче