Don't initialize V8 via Blink in ppapi plugins

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"
 
 bool g_sdk_initialized_via_pepper = false;
 
+gin::IsolateHolder* g_isolate_holder = nullptr;
+
 namespace chrome_pdf {
 
 PDFModule::PDFModule() {
 }
 
 PDFModule::~PDFModule() {
   if (g_sdk_initialized_via_pepper) {
     chrome_pdf::ShutdownSDK();
+    if (g_sdk_initialized_via_pepper) {

[Lei Zhang, 2015/09/16 21:22:24]

Didn't we just check |g_sdk_initialized_via_pepper| 2 lines up?

[jochen (gone - plz use gerrit), 2015/09/17 06:55:07]

done

+      g_isolate_holder->isolate()->Exit();
+      delete g_isolate_holder;
+      g_isolate_holder = nullptr;
+    }
     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);
     }
-    if (!chrome_pdf::InitializeSDK())
+    gin::IsolateHolder::Initialize(gin::IsolateHolder::kNonStrictMode,
+                                   gin::ArrayBufferAllocator::SharedInstance());
+    g_isolate_holder =

[Lei Zhang, 2015/09/16 21:22:24]

CreateInstance() only gets called once per process, right? Otherwise we can leak
a previous |g_isolate_holder|.

[raymes, 2015/09/17 02:30:41]

I believe CreateInstance will get called multiple times per process

[jochen (gone - plz use gerrit), 2015/09/17 06:55:07]

this block is protected by !g_sdk_initialized_via_pepper

+        new gin::IsolateHolder(gin::IsolateHolder::kSingleThread);
+      g_isolate_holder->isolate()->Enter();

[raymes, 2015/09/17 02:30:41]

nit: indentation looks funny here.

[jochen (gone - plz use gerrit), 2015/09/17 06:55:07]

done

+    if (!chrome_pdf::InitializeSDK()) {
+      g_isolate_holder->isolate()->Exit();

[Lei Zhang, 2015/09/16 21:22:24]

Write a function for these 3 lines? Then reused on line 34.

[jochen (gone - plz use gerrit), 2015/09/17 06:55:07]

done

+      delete g_isolate_holder;
+      g_isolate_holder = nullptr;
       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