Revert "Printing: Load the source PDF only once."

pdf/pdf.cc

Index: pdf/pdf.cc
diff --git a/pdf/pdf.cc b/pdf/pdf.cc
index e60c4bd0aa495e7b8777c87a48cf395b820186ef..e6cf54804c18ee0bc4086c6a891001f134187825 100644
--- a/pdf/pdf.cc
+++ b/pdf/pdf.cc
@@ -82,7 +82,8 @@ const void* PPP_GetInterface(const char* interface_name) {
 }
 
 #if defined(OS_WIN)
-bool RenderPDFPageToDC(void* pdf_handle,
+bool RenderPDFPageToDC(const void* pdf_buffer,
+                       int buffer_size,
                        int page_number,
                        HDC dc,
                        int dpi,
@@ -106,8 +107,8 @@ bool RenderPDFPageToDC(void* pdf_handle,
       pp::Rect(bounds_origin_x, bounds_origin_y, bounds_width, bounds_height),
       fit_to_bounds, stretch_to_bounds, keep_aspect_ratio, center_in_bounds,
       autorotate);
-  bool ret =
-      engine_exports->RenderPDFPageToDC(pdf_handle, page_number, settings, dc);
+  bool ret = engine_exports->RenderPDFPageToDC(pdf_buffer, buffer_size,
+                                               page_number, settings, dc);
   if (!g_sdk_initialized_via_pepper)
     ShutdownSDK();
 
@@ -127,49 +128,40 @@ void SetPDFUseGDIPrinting(bool enable) {
 bool GetPDFDocInfo(const void* pdf_buffer,
                    int buffer_size,
                    int* page_count,
-                   double* max_page_width,
-                   void** pdf_handle) {
+                   double* max_page_width) {
   if (!g_sdk_initialized_via_pepper) {
     if (!InitializeSDK())
       return false;
   }
   PDFEngineExports* engine_exports = PDFEngineExports::Get();
   bool ret = engine_exports->GetPDFDocInfo(pdf_buffer, buffer_size, page_count,
-                                           max_page_width, pdf_handle);
+                                           max_page_width);
   if (!g_sdk_initialized_via_pepper)
     ShutdownSDK();
 
   return ret;
 }
 
-void ReleasePDFHandle(void* pdf_handle) {
-  if (!g_sdk_initialized_via_pepper) {
-    if (!InitializeSDK())
-      return;
-  }
-  PDFEngineExports* engine_exports = PDFEngineExports::Get();
-  engine_exports->ReleasePDFHandle(pdf_handle);
-  if (!g_sdk_initialized_via_pepper)
-    ShutdownSDK();
-}
-
-bool GetPDFPageSizeByIndex(void* pdf_handle,
+bool GetPDFPageSizeByIndex(const void* pdf_buffer,
+                           int pdf_buffer_size,
                            int page_number,
                            double* width,
                            double* height) {
   if (!g_sdk_initialized_via_pepper) {
-    if (!InitializeSDK())
+    if (!chrome_pdf::InitializeSDK())
       return false;
   }
-  PDFEngineExports* engine_exports = PDFEngineExports::Get();
-  bool ret = engine_exports->GetPDFPageSizeByIndex(pdf_handle, page_number,
-                                                   width, height);
+  chrome_pdf::PDFEngineExports* engine_exports =
+      chrome_pdf::PDFEngineExports::Get();
+  bool ret = engine_exports->GetPDFPageSizeByIndex(pdf_buffer, pdf_buffer_size,
+                                                   page_number, width, height);
   if (!g_sdk_initialized_via_pepper)
-    ShutdownSDK();
+    chrome_pdf::ShutdownSDK();
   return ret;
 }
 
-bool RenderPDFPageToBitmap(void* pdf_handle,
+bool RenderPDFPageToBitmap(const void* pdf_buffer,
+                           int pdf_buffer_size,
                            int page_number,
                            void* bitmap_buffer,
                            int bitmap_width,
@@ -184,8 +176,8 @@ bool RenderPDFPageToBitmap(void* pdf_handle,
   PDFEngineExports::RenderingSettings settings(
       dpi, dpi, pp::Rect(bitmap_width, bitmap_height), true, false, true, true,
       autorotate);
-  bool ret = engine_exports->RenderPDFPageToBitmap(pdf_handle, page_number,
-                                                   settings, bitmap_buffer);
+  bool ret = engine_exports->RenderPDFPageToBitmap(
+      pdf_buffer, pdf_buffer_size, page_number, settings, bitmap_buffer);
   if (!g_sdk_initialized_via_pepper)
     ShutdownSDK();