Bug 1432651 part 6 - Stop using nsIPrintSession::GetRemotePrintJob in nsPrintSettingsService. r=bobowen
MozReview-Commit-ID: 2H3ybxeDxxg
--- 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());