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
 
 #include "base/command_line.h"
 #include "base/logging.h"
-#include "gin/array_buffer.h"
-#include "gin/public/isolate_holder.h"
 #include "pdf/out_of_process_instance.h"
 #include "ppapi/c/ppp.h"
 #include "ppapi/cpp/private/internal_module.h"
 #include "ppapi/cpp/private/pdf.h"
 #include "v8/include/v8.h"
 
 namespace chrome_pdf {
 
 namespace {
 
 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;
-}
-
 }  // namespace
 
 PDFModule::PDFModule() {
 }
 
 PDFModule::~PDFModule() {
   if (g_sdk_initialized_via_pepper) {
-    TearDownV8();
     chrome_pdf::ShutdownSDK();
     g_sdk_initialized_via_pepper = false;
   }
 }
 
 bool PDFModule::Init() {
   return true;
 }
 
 pp::Instance* PDFModule::CreateInstance(PP_Instance instance) {
   if (!g_sdk_initialized_via_pepper) {
     v8::StartupData natives;
     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();
-    if (!chrome_pdf::InitializeSDK()) {
-      TearDownV8();
+    if (!chrome_pdf::InitializeSDK())
       return NULL;
-    }
     g_sdk_initialized_via_pepper = true;
   }
 
   return new OutOfProcessInstance(instance);
 }
 
 
 // Implementation of Global PPP functions ---------------------------------
 int32_t PPP_InitializeModule(PP_Module module_id,
                              PPB_GetInterface get_browser_interface) {
@@ skipping 107 matching lines @@
       autorotate);
   bool ret = engine_exports->RenderPDFPageToBitmap(
       pdf_buffer, pdf_buffer_size, page_number, settings, bitmap_buffer);
   if (!g_sdk_initialized_via_pepper) {
     chrome_pdf::ShutdownSDK();
   }
   return ret;
 }
 
 }  // namespace chrome_pdf