Bug 1432651 part 6 - Stop using nsIPrintSession::GetRemotePrintJob in nsPrintSettingsService. r=bobowen draft
authorJonathan Watt <jwatt@jwatt.org>
Tue, 23 Jan 2018 23:48:40 +0000
changeset 723869 7d27e90e480280994bbbc9ff08a9ae63e5a3f0db
parent 723868 1b8e1416625d874d8d59a2bf628c561184e3d6e6
child 723870 4a1b3f278ec8a5820926685a155677c9f4af3fff
push id96561
push userjwatt@jwatt.org
push dateTue, 23 Jan 2018 23:51:24 +0000
reviewersbobowen
bugs1432651
milestone60.0a1
Bug 1432651 part 6 - Stop using nsIPrintSession::GetRemotePrintJob in nsPrintSettingsService. r=bobowen MozReview-Commit-ID: 2H3ybxeDxxg
widget/nsPrintSettingsService.cpp
--- a/widget/nsPrintSettingsService.cpp
+++ b/widget/nsPrintSettingsService.cpp
@@ -92,24 +92,19 @@ nsPrintSettingsService::Init()
   return NS_OK;
 }
 
 NS_IMETHODIMP
 nsPrintSettingsService::SerializeToPrintData(nsIPrintSettings* aSettings,
                                              nsIWebBrowserPrint* aWBP,
                                              PrintData* data)
 {
-  nsCOMPtr<nsIPrintSession> session;
-  nsresult rv = aSettings->GetPrintSession(getter_AddRefs(session));
-  if (NS_SUCCEEDED(rv) && session) {
-    RefPtr<RemotePrintJobChild> remotePrintJob;
-    rv = session->GetRemotePrintJob(getter_AddRefs(remotePrintJob));
-    if (NS_SUCCEEDED(rv)) {
-      data->remotePrintJobChild() = remotePrintJob;
-    }
+  if (aWBP && XRE_IsContentProcess() &&
+      Preferences::GetBool("print.print_via_parent")) {
+    data->remotePrintJobChild() = aWBP->GetRemotePrintJob();
   }
 
   aSettings->GetStartPageRange(&data->startPageRange());
   aSettings->GetEndPageRange(&data->endPageRange());
 
   aSettings->GetEdgeTop(&data->edgeTop());
   aSettings->GetEdgeLeft(&data->edgeLeft());
   aSettings->GetEdgeBottom(&data->edgeBottom());