Index: chrome/utility/printing_handler.cc |
diff --git a/chrome/utility/printing_handler.cc b/chrome/utility/printing_handler.cc |
index 73daac7c62d88fddee10484c4a7dc42fdb53caea..35dc231ea1d7948d5a827f3a05ac9896e43a1fc4 100644 |
--- a/chrome/utility/printing_handler.cc |
+++ b/chrome/utility/printing_handler.cc |
@@ -70,12 +70,6 @@ bool PrintingHandler::OnMessageReceived(const IPC::Message& message) { |
OnRenderPDFPagesToMetafileGetPage) |
IPC_MESSAGE_HANDLER(ChromeUtilityMsg_RenderPDFPagesToMetafiles_Stop, |
OnRenderPDFPagesToMetafileStop) |
- IPC_MESSAGE_HANDLER(ChromeUtilityMsg_RenderPDFPagesToPostScript_Start, |
- OnRenderPDFPagesToPostScriptStart) |
- IPC_MESSAGE_HANDLER(ChromeUtilityMsg_RenderPDFPagesToPostScript_GetPage, |
- OnRenderPDFPagesToPostScriptGetPage) |
- IPC_MESSAGE_HANDLER(ChromeUtilityMsg_RenderPDFPagesToPostScript_Stop, |
- OnRenderPDFPagesToPostScriptStop) |
#endif // OS_WIN |
#if BUILDFLAG(ENABLE_PRINT_PREVIEW) |
IPC_MESSAGE_HANDLER(ChromeUtilityMsg_RenderPDFPagesToPWGRaster, |
@@ -98,6 +92,13 @@ void PrintingHandler::OnRenderPDFPagesToMetafile( |
chrome_pdf::SetPDFPostscriptPrintingLevel(0); // Not using postscript. |
chrome_pdf::SetPDFUseGDIPrinting(pdf_rendering_settings_.mode == |
PdfRenderSettings::Mode::GDI_TEXT); |
+ if (pdf_rendering_settings_.mode == |
+ PdfRenderSettings::Mode::POSTSCRIPT_LEVEL2) { |
+ chrome_pdf::SetPDFPostscriptPrintingLevel(2); |
+ } else if (pdf_rendering_settings_.mode == |
+ PdfRenderSettings::Mode::POSTSCRIPT_LEVEL3) { |
+ chrome_pdf::SetPDFPostscriptPrintingLevel(3); |
+ } |
base::File pdf_file = IPC::PlatformFileForTransitToFile(pdf_transit); |
int page_count = LoadPDF(std::move(pdf_file)); |
Send( |
@@ -109,8 +110,17 @@ void PrintingHandler::OnRenderPDFPagesToMetafileGetPage( |
IPC::PlatformFileForTransit output_file) { |
base::File emf_file = IPC::PlatformFileForTransitToFile(output_file); |
float scale_factor = 1.0f; |
- bool success = |
- RenderPdfPageToMetafile(page_number, std::move(emf_file), &scale_factor); |
+ bool success = false; |
+ if (pdf_rendering_settings_.mode == |
+ PdfRenderSettings::Mode::POSTSCRIPT_LEVEL2 || |
+ pdf_rendering_settings_.mode == |
+ PdfRenderSettings::Mode::POSTSCRIPT_LEVEL3) { |
+ success = RenderPdfPageToPostScript(page_number, std::move(emf_file)); |
+ } else { |
+ success = RenderPdfPageToMetafile(page_number, std::move(emf_file), |
+ &scale_factor); |
+ } |
+ |
Send(new ChromeUtilityHostMsg_RenderPDFPagesToMetafiles_PageDone( |
success, scale_factor)); |
} |
@@ -119,35 +129,6 @@ void PrintingHandler::OnRenderPDFPagesToMetafileStop() { |
ReleaseProcessIfNeeded(); |
} |
-void PrintingHandler::OnRenderPDFPagesToPostScriptStart( |
- IPC::PlatformFileForTransit pdf_transit, |
- const PdfRenderSettings& settings) { |
- pdf_rendering_settings_ = settings; |
- if (pdf_rendering_settings_.mode == |
- PdfRenderSettings::Mode::POSTSCRIPT_LEVEL2) { |
- chrome_pdf::SetPDFPostscriptPrintingLevel(2); |
- } else if (pdf_rendering_settings_.mode == |
- PdfRenderSettings::Mode::POSTSCRIPT_LEVEL3) { |
- chrome_pdf::SetPDFPostscriptPrintingLevel(3); |
- } |
- |
- base::File pdf_file = IPC::PlatformFileForTransitToFile(pdf_transit); |
- int page_count = LoadPDF(std::move(pdf_file)); |
- Send(new ChromeUtilityHostMsg_RenderPDFPagesToPostScript_PageCount( |
- page_count)); |
-} |
- |
-void PrintingHandler::OnRenderPDFPagesToPostScriptGetPage( |
- int page_number, |
- IPC::PlatformFileForTransit output_file) { |
- base::File ps_file = IPC::PlatformFileForTransitToFile(output_file); |
- bool success = RenderPdfPageToPostScript(page_number, std::move(ps_file)); |
- Send(new ChromeUtilityHostMsg_RenderPDFPagesToPostScript_PageDone(success)); |
-} |
- |
-void PrintingHandler::OnRenderPDFPagesToPostScriptStop() { |
- ReleaseProcessIfNeeded(); |
-} |
#endif // defined(OS_WIN) |
#if BUILDFLAG(ENABLE_PRINT_PREVIEW) |