Setup and tear down V8 if the PDF module is not managed via pepper

pdf/pdf.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "pdf/pdf.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #endif
 
@@ skipping 14 matching lines @@
 bool g_sdk_initialized_via_pepper = false;
 
 gin::IsolateHolder* g_isolate_holder = nullptr;
 
 void TearDownV8() {
   g_isolate_holder->isolate()->Exit();
   delete g_isolate_holder;
   g_isolate_holder = nullptr;
 }
 
+void SetUpV8() {
+  g_isolate_holder =
+      new gin::IsolateHolder(gin::IsolateHolder::kSingleThread);
+  g_isolate_holder->isolate()->Enter();
+}
+
 }  // namespace
 
 PDFModule::PDFModule() {
 }
 
 PDFModule::~PDFModule() {
   if (g_sdk_initialized_via_pepper) {
     TearDownV8();
     chrome_pdf::ShutdownSDK();
     g_sdk_initialized_via_pepper = false;
@@ skipping 10 matching lines @@
     v8::StartupData snapshot;
     pp::PDF::GetV8ExternalSnapshotData(pp::InstanceHandle(instance),
                                        &natives.data, &natives.raw_size,
                                        &snapshot.data, &snapshot.raw_size);
     if (natives.data) {
       v8::V8::SetNativesDataBlob(&natives);
       v8::V8::SetSnapshotDataBlob(&snapshot);
     }
     gin::IsolateHolder::Initialize(gin::IsolateHolder::kNonStrictMode,
                                    gin::ArrayBufferAllocator::SharedInstance());
-    g_isolate_holder =
-        new gin::IsolateHolder(gin::IsolateHolder::kSingleThread);
-    g_isolate_holder->isolate()->Enter();
+    SetUpV8();
     if (!chrome_pdf::InitializeSDK()) {

[Lei Zhang, 2015/11/05 21:44:01]

Should we write wrappers for chrome_pdf::InitializeSDK() and
chrome_pdf::ShutdownSDK() instead? It seems we call SetUpV8() and TearDownV8()
in all the same places.

       TearDownV8();
       return NULL;
     }
     g_sdk_initialized_via_pepper = true;
   }
 
   return new OutOfProcessInstance(instance);
 }
 
 
@@ skipping 30 matching lines @@
                                  int bounds_origin_x,
                                  int bounds_origin_y,
                                  int bounds_width,
                                  int bounds_height,
                                  bool fit_to_bounds,
                                  bool stretch_to_bounds,
                                  bool keep_aspect_ratio,
                                  bool center_in_bounds,
                                  bool autorotate) {
   if (!g_sdk_initialized_via_pepper) {
+    SetUpV8();
     if (!chrome_pdf::InitializeSDK()) {
+      TearDownV8();
       return false;
     }
   }
   scoped_ptr<chrome_pdf::PDFEngineExports> engine_exports(
       chrome_pdf::PDFEngineExports::Create());
   chrome_pdf::PDFEngineExports::RenderingSettings settings(
       dpi, dpi, 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_buffer, buffer_size,
                                                page_number, settings, dc);
   if (!g_sdk_initialized_via_pepper) {
+    TearDownV8();
     chrome_pdf::ShutdownSDK();
   }
   return ret;
 }
 
 #endif  // OS_WIN
 
 bool GetPDFDocInfo(const void* pdf_buffer,
                    int buffer_size, int* page_count,
                    double* max_page_width) {
   if (!g_sdk_initialized_via_pepper) {
-    if (!chrome_pdf::InitializeSDK())
+    SetUpV8();
+    if (!chrome_pdf::InitializeSDK()) {
+      TearDownV8();
       return false;
+    }
   }
   scoped_ptr<chrome_pdf::PDFEngineExports> engine_exports(
       chrome_pdf::PDFEngineExports::Create());
   bool ret = engine_exports->GetPDFDocInfo(
       pdf_buffer, buffer_size, page_count, max_page_width);
   if (!g_sdk_initialized_via_pepper) {
+    TearDownV8();
     chrome_pdf::ShutdownSDK();
   }
   return ret;
 }
 
 bool GetPDFPageSizeByIndex(const void* pdf_buffer,
                            int pdf_buffer_size, int page_number,
                            double* width, double* height) {
   if (!g_sdk_initialized_via_pepper) {
-    if (!chrome_pdf::InitializeSDK())
+    SetUpV8();
+    if (!chrome_pdf::InitializeSDK()) {
+      TearDownV8();
       return false;
+    }
   }
   scoped_ptr<chrome_pdf::PDFEngineExports> engine_exports(
       chrome_pdf::PDFEngineExports::Create());
   bool ret = engine_exports->GetPDFPageSizeByIndex(
       pdf_buffer, pdf_buffer_size, page_number, width, height);
-  if (!g_sdk_initialized_via_pepper)
+  if (!g_sdk_initialized_via_pepper) {
+    TearDownV8();
     chrome_pdf::ShutdownSDK();
+  }
   return ret;
 }
 
 bool RenderPDFPageToBitmap(const void* pdf_buffer,
                            int pdf_buffer_size,
                            int page_number,
                            void* bitmap_buffer,
                            int bitmap_width,
                            int bitmap_height,
                            int dpi,
                            bool autorotate) {
   if (!g_sdk_initialized_via_pepper) {
-    if (!chrome_pdf::InitializeSDK())
+    SetUpV8();
+    if (!chrome_pdf::InitializeSDK()) {
+      TearDownV8();
       return false;
+    }
   }
   scoped_ptr<chrome_pdf::PDFEngineExports> engine_exports(
       chrome_pdf::PDFEngineExports::Create());
   chrome_pdf::PDFEngineExports::RenderingSettings settings(
       dpi, dpi, pp::Rect(bitmap_width, bitmap_height), true, false, true, true,
       autorotate);
   bool ret = engine_exports->RenderPDFPageToBitmap(
       pdf_buffer, pdf_buffer_size, page_number, settings, bitmap_buffer);
   if (!g_sdk_initialized_via_pepper) {
+    TearDownV8();
     chrome_pdf::ShutdownSDK();
   }
   return ret;
 }
 
 }  // namespace chrome_pdf