Bug 1217190 - Make PrintingParent return an nsresult when attempting to show print progress. r=bobowen

--HG--
extra : commitid : LH8E3YSVlSd
extra : rebase_source : a48a93195c576648f4a46c9eb60756186684e0eb
extra : histedit_source : f582237e3e58d92a1ec38a4b2a82d77bae620d48

embedding/components/printingui/ipc/PPrinting.ipdl

@@ -23,7 +23,7 @@ parent:
                     PPrintProgressDialog printProgressDialog,
                     bool isForPrinting)
     returns(bool notifyOnOpen,
-            bool success);
+            nsresult rv);
 
   async ShowPrintDialog(PPrintSettingsDialog dialog,
                         PBrowser browser,

embedding/components/printingui/ipc/PrintingParent.cpp

@@ -30,9 +30,9 @@ PrintingParent::RecvShowProgress(PBrowserParent* parent,
                                  PPrintProgressDialogParent* printProgressDialog,
                                  const bool& isForPrinting,
                                  bool* notifyOnOpen,
-                                 bool* success)
+                                 nsresult* result)
 {
-  *success = false;
+  *result = NS_ERROR_FAILURE;
 
   nsCOMPtr<nsIDOMWindow> parentWin = DOMWindowFromBrowserParent(parent);
   if (!parentWin) {
@@ -52,17 +52,16 @@ PrintingParent::RecvShowProgress(PBrowserParent* parent,
   nsCOMPtr<nsIWebProgressListener> printProgressListener;
   nsCOMPtr<nsIPrintProgressParams> printProgressParams;
 
-  nsresult rv = pps->ShowProgress(parentWin, nullptr, nullptr, observer,
-                                  isForPrinting,
-                                  getter_AddRefs(printProgressListener),
-                                  getter_AddRefs(printProgressParams),
-                                  notifyOnOpen);
-  NS_ENSURE_SUCCESS(rv, true);
+  *result = pps->ShowProgress(parentWin, nullptr, nullptr, observer,
+                              isForPrinting,
+                              getter_AddRefs(printProgressListener),
+                              getter_AddRefs(printProgressParams),
+                              notifyOnOpen);
+  NS_ENSURE_SUCCESS(*result, true);
 
   dialogParent->SetWebProgressListener(printProgressListener);
   dialogParent->SetPrintProgressParams(printProgressParams);
 
-  *success = true;
   return true;
 }
 

embedding/components/printingui/ipc/PrintingParent.h

@@ -25,7 +25,7 @@ public:
                      PPrintProgressDialogParent* printProgressDialog,
                      const bool& isForPrinting,
                      bool* notifyOnOpen,
-                     bool* success);
+                     nsresult* result);
     virtual bool
     RecvShowPrintDialog(PPrintSettingsDialogParent* aDialog,
                         PBrowserParent* aParent,

embedding/components/printingui/ipc/nsPrintingProxy.cpp

@@ -149,10 +149,12 @@ nsPrintingProxy::ShowProgress(nsIDOMWindow*            parent,
 
   SendPPrintProgressDialogConstructor(dialogChild);
 
-  bool success = false;
-
   mozilla::unused << SendShowProgress(pBrowser, dialogChild,
-                                      isForPrinting, notifyOnOpen, &success);
+                                      isForPrinting, notifyOnOpen, &rv);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+
   NS_ADDREF(*webProgressListener = dialogChild);
   NS_ADDREF(*printProgressParams = dialogChild);