diff --git a/dom/ipc/ContentChild.cpp b/dom/ipc/ContentChild.cpp index 8e76c1ff312..6001a651ae3 100644 --- a/dom/ipc/ContentChild.cpp +++ b/dom/ipc/ContentChild.cpp @@ -1544,10 +1544,11 @@ ContentChild::DeallocPNeckoChild(PNeckoChild* necko) PPrintingChild* ContentChild::AllocPPrintingChild() { - // The ContentParent should never attempt to allocate the nsPrintingProxy, - // which implements PPrintingChild. Instead, the nsPrintingProxy service is - // requested and instantiated via XPCOM, and the constructor of - // nsPrintingProxy sets up the IPC connection. + // The ContentParent should never attempt to allocate the + // nsPrintingPromptServiceProxy, which implements PPrintingChild. Instead, + // the nsPrintingPromptServiceProxy service is requested and instantiated + // via XPCOM, and the constructor of nsPrintingPromptServiceProxy sets up + // the IPC connection. NS_NOTREACHED("Should never get here!"); return nullptr; } diff --git a/embedding/components/build/nsEmbeddingModule.cpp b/embedding/components/build/nsEmbeddingModule.cpp index 9d574a8d937..e766b10ee1f 100644 --- a/embedding/components/build/nsEmbeddingModule.cpp +++ b/embedding/components/build/nsEmbeddingModule.cpp @@ -20,7 +20,7 @@ #ifdef NS_PRINTING #include "nsPrintingPromptService.h" -#include "nsPrintingProxy.h" +#include "nsPrintingPromptServiceProxy.h" #endif @@ -40,7 +40,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsDialogParamBlock) #ifdef NS_PRINTING NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsPrintingPromptService, Init) #ifdef PROXY_PRINTING -NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsPrintingProxy, Init) +NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsPrintingPromptServiceProxy, Init) #endif #endif #endif @@ -70,7 +70,7 @@ static const mozilla::Module::CIDEntry kEmbeddingCIDs[] = { #ifdef PROXY_PRINTING { &kNS_PRINTINGPROMPTSERVICE_CID, false, nullptr, nsPrintingPromptServiceConstructor, mozilla::Module::MAIN_PROCESS_ONLY }, - { &kNS_PRINTINGPROMPTSERVICE_CID, false, nullptr, nsPrintingProxyConstructor, + { &kNS_PRINTINGPROMPTSERVICE_CID, false, nullptr, nsPrintingPromptServiceProxyConstructor, mozilla::Module::CONTENT_PROCESS_ONLY }, #else { &kNS_PRINTINGPROMPTSERVICE_CID, false, nullptr, nsPrintingPromptServiceConstructor }, diff --git a/embedding/components/printingui/ipc/moz.build b/embedding/components/printingui/ipc/moz.build index b335c73241d..2ac8456baf6 100644 --- a/embedding/components/printingui/ipc/moz.build +++ b/embedding/components/printingui/ipc/moz.build @@ -10,7 +10,7 @@ EXPORTS.mozilla.embedding.printingui += [ if CONFIG['NS_PRINTING']: UNIFIED_SOURCES += [ - 'nsPrintingProxy.cpp', + 'nsPrintingPromptServiceProxy.cpp', 'PrintDataUtils.cpp', 'PrintingParent.cpp', 'PrintProgressDialogChild.cpp', diff --git a/embedding/components/printingui/ipc/nsPrintingProxy.cpp b/embedding/components/printingui/ipc/nsPrintingPromptServiceProxy.cpp similarity index 66% rename from embedding/components/printingui/ipc/nsPrintingProxy.cpp rename to embedding/components/printingui/ipc/nsPrintingPromptServiceProxy.cpp index 190ce1e3e06..532647cdf26 100644 --- a/embedding/components/printingui/ipc/nsPrintingProxy.cpp +++ b/embedding/components/printingui/ipc/nsPrintingPromptServiceProxy.cpp @@ -11,7 +11,7 @@ #include "nsIDocShellTreeOwner.h" #include "nsIPrintingPromptService.h" #include "nsPIDOMWindow.h" -#include "nsPrintingProxy.h" +#include "nsPrintingPromptServiceProxy.h" #include "nsPrintOptionsImpl.h" #include "PrintDataUtils.h" #include "PrintProgressDialogChild.h" @@ -20,27 +20,27 @@ using namespace mozilla; using namespace mozilla::dom; using namespace mozilla::embedding; -NS_IMPL_ISUPPORTS(nsPrintingProxy, nsIPrintingPromptService) +NS_IMPL_ISUPPORTS(nsPrintingPromptServiceProxy, nsIPrintingPromptService) -nsPrintingProxy::nsPrintingProxy() +nsPrintingPromptServiceProxy::nsPrintingPromptServiceProxy() { } -nsPrintingProxy::~nsPrintingProxy() +nsPrintingPromptServiceProxy::~nsPrintingPromptServiceProxy() { } nsresult -nsPrintingProxy::Init() +nsPrintingPromptServiceProxy::Init() { mozilla::unused << ContentChild::GetSingleton()->SendPPrintingConstructor(this); return NS_OK; } NS_IMETHODIMP -nsPrintingProxy::ShowPrintDialog(nsIDOMWindow *parent, - nsIWebBrowserPrint *webBrowserPrint, - nsIPrintSettings *printSettings) +nsPrintingPromptServiceProxy::ShowPrintDialog(nsIDOMWindow *parent, + nsIWebBrowserPrint *webBrowserPrint, + nsIPrintSettings *printSettings) { NS_ENSURE_ARG(parent); NS_ENSURE_ARG(webBrowserPrint); @@ -86,14 +86,14 @@ nsPrintingProxy::ShowPrintDialog(nsIDOMWindow *parent, } NS_IMETHODIMP -nsPrintingProxy::ShowProgress(nsIDOMWindow* parent, - nsIWebBrowserPrint* webBrowserPrint, // ok to be null - nsIPrintSettings* printSettings, // ok to be null - nsIObserver* openDialogObserver, // ok to be null - bool isForPrinting, - nsIWebProgressListener** webProgressListener, - nsIPrintProgressParams** printProgressParams, - bool* notifyOnOpen) +nsPrintingPromptServiceProxy::ShowProgress(nsIDOMWindow* parent, + nsIWebBrowserPrint* webBrowserPrint, // ok to be null + nsIPrintSettings* printSettings, // ok to be null + nsIObserver* openDialogObserver, // ok to be null + bool isForPrinting, + nsIWebProgressListener** webProgressListener, + nsIPrintProgressParams** printProgressParams, + bool* notifyOnOpen) { NS_ENSURE_ARG(parent); NS_ENSURE_ARG(webProgressListener); @@ -129,37 +129,37 @@ nsPrintingProxy::ShowProgress(nsIDOMWindow* parent, } NS_IMETHODIMP -nsPrintingProxy::ShowPageSetup(nsIDOMWindow *parent, - nsIPrintSettings *printSettings, - nsIObserver *aObs) +nsPrintingPromptServiceProxy::ShowPageSetup(nsIDOMWindow *parent, + nsIPrintSettings *printSettings, + nsIObserver *aObs) { return NS_ERROR_NOT_IMPLEMENTED; } NS_IMETHODIMP -nsPrintingProxy::ShowPrinterProperties(nsIDOMWindow *parent, - const char16_t *printerName, - nsIPrintSettings *printSettings) +nsPrintingPromptServiceProxy::ShowPrinterProperties(nsIDOMWindow *parent, + const char16_t *printerName, + nsIPrintSettings *printSettings) { return NS_ERROR_NOT_IMPLEMENTED; } PPrintProgressDialogChild* -nsPrintingProxy::AllocPPrintProgressDialogChild() +nsPrintingPromptServiceProxy::AllocPPrintProgressDialogChild() { // The parent process will never initiate the PPrintProgressDialog // protocol connection, so no need to provide an allocator here. NS_NOTREACHED("Allocator for PPrintProgressDialogChild should not be " - "called on nsPrintingProxy."); + "called on nsPrintingPromptServiceProxy."); return nullptr; } bool -nsPrintingProxy::DeallocPPrintProgressDialogChild(PPrintProgressDialogChild* aActor) +nsPrintingPromptServiceProxy::DeallocPPrintProgressDialogChild(PPrintProgressDialogChild* aActor) { // The parent process will never initiate the PPrintProgressDialog // protocol connection, so no need to provide an deallocator here. NS_NOTREACHED("Deallocator for PPrintProgressDialogChild should not be " - "called on nsPrintingProxy."); + "called on nsPrintingPromptServiceProxy."); return false; } diff --git a/embedding/components/printingui/ipc/nsPrintingProxy.h b/embedding/components/printingui/ipc/nsPrintingPromptServiceProxy.h similarity index 68% rename from embedding/components/printingui/ipc/nsPrintingProxy.h rename to embedding/components/printingui/ipc/nsPrintingPromptServiceProxy.h index 66c1617018e..317117e8680 100644 --- a/embedding/components/printingui/ipc/nsPrintingProxy.h +++ b/embedding/components/printingui/ipc/nsPrintingPromptServiceProxy.h @@ -3,19 +3,19 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef __nsPrintingProxy_h -#define __nsPrintingProxy_h +#ifndef __nsPrintingPromptServiceProxy_h +#define __nsPrintingPromptServiceProxy_h #include "nsIPrintingPromptService.h" #include "mozilla/embedding/PPrintingChild.h" -class nsPrintingProxy: public nsIPrintingPromptService, - public mozilla::embedding::PPrintingChild +class nsPrintingPromptServiceProxy: public nsIPrintingPromptService, + public mozilla::embedding::PPrintingChild { - virtual ~nsPrintingProxy(); + virtual ~nsPrintingPromptServiceProxy(); public: - nsPrintingProxy(); + nsPrintingPromptServiceProxy(); nsresult Init();