Bug 1088070 - Rename nsPrintingPromptServiceProxy to nsPrintingProxy. r=smaug.
authorMike Conley <mconley@mozilla.com>
Thu, 05 Mar 2015 13:12:41 -0500
changeset 232183 8893464d6b2d9f82aac735c6578a48bb34c28618
parent 232182 1c9ad6279fa635fb239ca8885365a4c6f4668f73
child 232184 dbe733cadbb6c9703da3c629faee420a17d1a84f
push id28372
push usercbook@mozilla.com
push dateFri, 06 Mar 2015 12:07:51 +0000
treeherdermozilla-central@7d85ac833cff [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssmaug
bugs1088070
milestone39.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1088070 - Rename nsPrintingPromptServiceProxy to nsPrintingProxy. r=smaug.
dom/ipc/ContentChild.cpp
embedding/components/build/nsEmbeddingModule.cpp
embedding/components/printingui/ipc/moz.build
embedding/components/printingui/ipc/nsPrintingPromptServiceProxy.cpp
embedding/components/printingui/ipc/nsPrintingPromptServiceProxy.h
embedding/components/printingui/ipc/nsPrintingProxy.cpp
embedding/components/printingui/ipc/nsPrintingProxy.h
--- a/dom/ipc/ContentChild.cpp
+++ b/dom/ipc/ContentChild.cpp
@@ -1539,21 +1539,20 @@ ContentChild::DeallocPNeckoChild(PNeckoC
 {
     delete necko;
     return true;
 }
 
 PPrintingChild*
 ContentChild::AllocPPrintingChild()
 {
-    // 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.
+    // 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.
     NS_NOTREACHED("Should never get here!");
     return nullptr;
 }
 
 bool
 ContentChild::DeallocPPrintingChild(PPrintingChild* printing)
 {
     return true;
--- a/embedding/components/build/nsEmbeddingModule.cpp
+++ b/embedding/components/build/nsEmbeddingModule.cpp
@@ -15,17 +15,17 @@
 #include "nsCommandParams.h"
 #include "nsCommandGroup.h"
 #include "nsBaseCommandController.h"
 #include "nsNetCID.h"
 #include "nsEmbedCID.h"
 
 #ifdef NS_PRINTING
 #include "nsPrintingPromptService.h"
-#include "nsPrintingPromptServiceProxy.h"
+#include "nsPrintingProxy.h"
 #endif
 
 
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsWindowWatcher, Init)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsAppStartupNotifier)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsFind)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsWebBrowserFind)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsWebBrowserPersist)
@@ -35,17 +35,17 @@ NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsCo
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsControllerCommandGroup)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsBaseCommandController)
 
 #ifdef MOZ_XUL
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsDialogParamBlock)
 #ifdef NS_PRINTING
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsPrintingPromptService, Init)
 #ifdef PROXY_PRINTING
-NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsPrintingPromptServiceProxy, Init)
+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsPrintingProxy, Init)
 #endif
 #endif
 #endif
 
 #ifdef MOZ_XUL
 NS_DEFINE_NAMED_CID(NS_DIALOGPARAMBLOCK_CID);
 #ifdef NS_PRINTING
 NS_DEFINE_NAMED_CID(NS_PRINTINGPROMPTSERVICE_CID);
@@ -65,17 +65,17 @@ NS_DEFINE_NAMED_CID(NS_BASECOMMANDCONTRO
 static const mozilla::Module::CIDEntry kEmbeddingCIDs[] = {
 #ifdef MOZ_XUL
     { &kNS_DIALOGPARAMBLOCK_CID, false, nullptr, nsDialogParamBlockConstructor },
 #ifdef NS_PRINTING
 
 #ifdef PROXY_PRINTING
     { &kNS_PRINTINGPROMPTSERVICE_CID, false, nullptr, nsPrintingPromptServiceConstructor,
       mozilla::Module::MAIN_PROCESS_ONLY },
-    { &kNS_PRINTINGPROMPTSERVICE_CID, false, nullptr, nsPrintingPromptServiceProxyConstructor,
+    { &kNS_PRINTINGPROMPTSERVICE_CID, false, nullptr, nsPrintingProxyConstructor,
       mozilla::Module::CONTENT_PROCESS_ONLY },
 #else
     { &kNS_PRINTINGPROMPTSERVICE_CID, false, nullptr, nsPrintingPromptServiceConstructor },
 #endif
 #endif
 #endif
     { &kNS_WINDOWWATCHER_CID, false, nullptr, nsWindowWatcherConstructor },
     { &kNS_FIND_CID, false, nullptr, nsFindConstructor },
--- a/embedding/components/printingui/ipc/moz.build
+++ b/embedding/components/printingui/ipc/moz.build
@@ -5,17 +5,17 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 EXPORTS.mozilla.embedding.printingui += [
     'PrintingParent.h',
 ]
 
 if CONFIG['NS_PRINTING']:
     UNIFIED_SOURCES += [
-        'nsPrintingPromptServiceProxy.cpp',
+        'nsPrintingProxy.cpp',
         'PrintDataUtils.cpp',
         'PrintingParent.cpp',
         'PrintProgressDialogChild.cpp',
         'PrintProgressDialogParent.cpp',
     ]
 
 IPDL_SOURCES += [
     'PPrinting.ipdl',
rename from embedding/components/printingui/ipc/nsPrintingPromptServiceProxy.cpp
rename to embedding/components/printingui/ipc/nsPrintingProxy.cpp
--- a/embedding/components/printingui/ipc/nsPrintingPromptServiceProxy.cpp
+++ b/embedding/components/printingui/ipc/nsPrintingProxy.cpp
@@ -6,46 +6,46 @@
 
 #include "mozilla/dom/ContentChild.h"
 #include "mozilla/dom/TabChild.h"
 #include "mozilla/unused.h"
 #include "nsIDocShell.h"
 #include "nsIDocShellTreeOwner.h"
 #include "nsIPrintingPromptService.h"
 #include "nsPIDOMWindow.h"
-#include "nsPrintingPromptServiceProxy.h"
+#include "nsPrintingProxy.h"
 #include "nsPrintOptionsImpl.h"
 #include "PrintDataUtils.h"
 #include "PrintProgressDialogChild.h"
 
 using namespace mozilla;
 using namespace mozilla::dom;
 using namespace mozilla::embedding;
 
-NS_IMPL_ISUPPORTS(nsPrintingPromptServiceProxy, nsIPrintingPromptService)
+NS_IMPL_ISUPPORTS(nsPrintingProxy, nsIPrintingPromptService)
 
-nsPrintingPromptServiceProxy::nsPrintingPromptServiceProxy()
+nsPrintingProxy::nsPrintingProxy()
 {
 }
 
-nsPrintingPromptServiceProxy::~nsPrintingPromptServiceProxy()
+nsPrintingProxy::~nsPrintingProxy()
 {
 }
 
 nsresult
-nsPrintingPromptServiceProxy::Init()
+nsPrintingProxy::Init()
 {
   mozilla::unused << ContentChild::GetSingleton()->SendPPrintingConstructor(this);
   return NS_OK;
 }
 
 NS_IMETHODIMP
-nsPrintingPromptServiceProxy::ShowPrintDialog(nsIDOMWindow *parent,
-                                              nsIWebBrowserPrint *webBrowserPrint,
-                                              nsIPrintSettings *printSettings)
+nsPrintingProxy::ShowPrintDialog(nsIDOMWindow *parent,
+                                 nsIWebBrowserPrint *webBrowserPrint,
+                                 nsIPrintSettings *printSettings)
 {
   NS_ENSURE_ARG(parent);
   NS_ENSURE_ARG(webBrowserPrint);
   NS_ENSURE_ARG(printSettings);
 
   // Get the root docshell owner of this nsIDOMWindow, which
   // should map to a TabChild, which we can then pass up to
   // the parent.
@@ -81,24 +81,24 @@ nsPrintingPromptServiceProxy::ShowPrintD
     return NS_ERROR_FAILURE;
   }
 
   rv = po->DeserializeToPrintSettings(modifiedSettings, printSettings);
   return NS_OK;
 }
 
 NS_IMETHODIMP
-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)
+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)
 {
   NS_ENSURE_ARG(parent);
   NS_ENSURE_ARG(webProgressListener);
   NS_ENSURE_ARG(printProgressParams);
   NS_ENSURE_ARG(notifyOnOpen);
 
   // Get the root docshell owner of this nsIDOMWindow, which
   // should map to a TabChild, which we can then pass up to
@@ -124,42 +124,42 @@ nsPrintingPromptServiceProxy::ShowProgre
                                       isForPrinting, notifyOnOpen, &success);
   NS_ADDREF(*webProgressListener = dialogChild);
   NS_ADDREF(*printProgressParams = dialogChild);
 
   return NS_OK;
 }
 
 NS_IMETHODIMP
-nsPrintingPromptServiceProxy::ShowPageSetup(nsIDOMWindow *parent,
-                                            nsIPrintSettings *printSettings,
-                                            nsIObserver *aObs)
+nsPrintingProxy::ShowPageSetup(nsIDOMWindow *parent,
+                               nsIPrintSettings *printSettings,
+                               nsIObserver *aObs)
 {
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 NS_IMETHODIMP
-nsPrintingPromptServiceProxy::ShowPrinterProperties(nsIDOMWindow *parent,
-                                                    const char16_t *printerName,
-                                                    nsIPrintSettings *printSettings)
+nsPrintingProxy::ShowPrinterProperties(nsIDOMWindow *parent,
+                                       const char16_t *printerName,
+                                       nsIPrintSettings *printSettings)
 {
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 PPrintProgressDialogChild*
-nsPrintingPromptServiceProxy::AllocPPrintProgressDialogChild()
+nsPrintingProxy::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 nsPrintingPromptServiceProxy.");
+                "called on nsPrintingProxy.");
   return nullptr;
 }
 
 bool
-nsPrintingPromptServiceProxy::DeallocPPrintProgressDialogChild(PPrintProgressDialogChild* aActor)
+nsPrintingProxy::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 nsPrintingPromptServiceProxy.");
+                "called on nsPrintingProxy.");
   return false;
 }
rename from embedding/components/printingui/ipc/nsPrintingPromptServiceProxy.h
rename to embedding/components/printingui/ipc/nsPrintingProxy.h
--- a/embedding/components/printingui/ipc/nsPrintingPromptServiceProxy.h
+++ b/embedding/components/printingui/ipc/nsPrintingProxy.h
@@ -1,26 +1,26 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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 __nsPrintingPromptServiceProxy_h
-#define __nsPrintingPromptServiceProxy_h
+#ifndef __nsPrintingProxy_h
+#define __nsPrintingProxy_h
 
 #include "nsIPrintingPromptService.h"
 #include "mozilla/embedding/PPrintingChild.h"
 
-class nsPrintingPromptServiceProxy: public nsIPrintingPromptService,
-                                    public mozilla::embedding::PPrintingChild
+class nsPrintingProxy: public nsIPrintingPromptService,
+                       public mozilla::embedding::PPrintingChild
 {
-    virtual ~nsPrintingPromptServiceProxy();
+    virtual ~nsPrintingProxy();
 
 public:
-    nsPrintingPromptServiceProxy();
+    nsPrintingProxy();
 
     nsresult Init();
 
     NS_DECL_ISUPPORTS
     NS_DECL_NSIPRINTINGPROMPTSERVICE
 
     virtual PPrintProgressDialogChild*
     AllocPPrintProgressDialogChild() MOZ_OVERRIDE;