Update to Chromium revision b0aa1fb5 (#296183).

- Restore CefRenderHandler::OnScrollOffsetChanged.
- Add new RT_PING and RT_SERVICE_WORKER resource type values.
- The resource type for image sub-resource loads has changed from RT_IMAGE to RT_PREFETCH (this is a regression, see http://crbug.com/415253#c23).
- Add a patch to fix a crash in Scheduler::swapQueuesRunPendingTasks* (http://crbug.com/415478).
- Add documentation for cef_key_event_type_t values.

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1846 5089003a-bbd8-11dd-ad1f-f1f9622dbc98

libcef/utility/printing_handler.h

@@ -9,13 +9,15 @@
 #include "base/macros.h"
 #include "chrome/utility/utility_message_handler.h"
 #include "ipc/ipc_platform_file.h"
+#include "printing/pdf_render_settings.h"
 
-#if !defined(ENABLE_FULL_PRINTING)
-#error "Full printing must be enabled"
+#if !defined(OS_WIN)
+#error "Must be building on Windows."
 #endif
 
 namespace printing {
 class PdfRenderSettings;
+struct PwgRasterSettings;
 struct PageRange;
 }
 
@@ -32,31 +34,22 @@ class PrintingHandler : public UtilityMessageHandler {
 
  private:
   // IPC message handlers.
-#if defined(WIN_PDF_METAFILE_FOR_PRINTING)
-  void OnRenderPDFPagesToMetafile(
-      IPC::PlatformFileForTransit pdf_transit,
-      const base::FilePath& metafile_path,
-      const printing::PdfRenderSettings& settings,
-      const std::vector<printing::PageRange>& page_ranges);
-#endif
+#if defined(OS_WIN)
+  void OnRenderPDFPagesToMetafile(IPC::PlatformFileForTransit pdf_transit,
+                                  const printing::PdfRenderSettings& settings);
+  void OnRenderPDFPagesToMetafileGetPage(
+      int page_number,
+      IPC::PlatformFileForTransit output_file);
+  void OnRenderPDFPagesToMetafileStop();
 
-#if defined(WIN_PDF_METAFILE_FOR_PRINTING)
-  // Helper method for Windows.
-  // |highest_rendered_page_number| is set to -1 on failure to render any page.
-  // |page_ranges| is both input and output. If supplied as input, only the
-  // specified pages will be rendered. If an empty vector is supplied it will
-  // be filled with a range of all pages that were rendered.
-  bool RenderPDFToWinMetafile(
-      base::File pdf_file,
-      const base::FilePath& metafile_path,
-      const printing::PdfRenderSettings& settings,
-      std::vector<printing::PageRange>* page_ranges,
-      int* highest_rendered_page_number,
-      double* scale_factor);
-#endif
+  int LoadPDF(base::File pdf_file);
+  bool RenderPdfPageToMetafile(int page_number,
+                               base::File output_file,
+                               double* scale_factor);
 
-  void OnGetPrinterCapsAndDefaults(const std::string& printer_name);
-  void OnGetPrinterSemanticCapsAndDefaults(const std::string& printer_name);
+  std::vector<char> pdf_data_;
+  printing::PdfRenderSettings pdf_rendering_settings_;
+#endif  // defined(OS_WIN)
 
   DISALLOW_COPY_AND_ASSIGN(PrintingHandler);
 };