Don't initialize V8 via Blink in ppapi plugins

Instead, for the PDF plugin, use gin to manage V8.

Also add myself as owner for the v8 stuff.

BUG=530093
R=raymes@chromium.org,thestig@chromium.org

Review URL: https://codereview.chromium.org/1346143003

Cr-Commit-Position: refs/heads/master@{#349379}

content/ppapi_plugin/ppapi_thread.cc

@@ -113,7 +113,7 @@ PpapiThread::PpapiThread(const base::CommandLine& command_line, bool is_broker)
       command_line.GetSwitchValueASCII(switches::kPpapiFlashArgs));
 
   blink_platform_impl_.reset(new PpapiBlinkPlatformImpl);
-  blink::initialize(blink_platform_impl_.get());
+  blink::initializeWithoutV8(blink_platform_impl_.get());
 
   if (!is_broker_) {
     scoped_refptr<ppapi::proxy::PluginMessageFilter> plugin_filter(
@@ -141,7 +141,7 @@ void PpapiThread::Shutdown() {
   if (plugin_entry_points_.shutdown_module)
     plugin_entry_points_.shutdown_module();
   blink_platform_impl_->Shutdown();
-  blink::shutdown();
+  blink::shutdownWithoutV8();
 }
 
 bool PpapiThread::Send(IPC::Message* msg) {

pdf/BUILD.gn

@@ -52,6 +52,7 @@ static_library("pdf") {
     "//base",
     "//components/ui/zoom",
     "//content/public/common",
+    "//gin",
     "//net",
     "//ppapi/cpp:objects",
     "//ppapi/cpp/private:internal_module",

pdf/DEPS

@@ -1,6 +1,6 @@
 include_rules = [
   "+chrome/common/content_restriction.h",
-  "+gin/public/gin_embedders.h",
+  "+gin",
   "+net",
   "+ppapi",
   "+printing/units.h",

pdf/OWNERS

@@ -1,4 +1,5 @@
 gene@chromium.org
 jam@chromium.org
+jochen@chromium.org
 raymes@chromium.org
 thestig@chromium.org

pdf/pdf.cc

@@ -10,21 +10,36 @@
 
 #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;
 
-namespace chrome_pdf {
+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;
   }
@@ -45,8 +60,15 @@ pp::Instance* PDFModule::CreateInstance(PP_Instance instance) {
       v8::V8::SetNativesDataBlob(&natives);
       v8::V8::SetSnapshotDataBlob(&snapshot);
     }
-    if (!chrome_pdf::InitializeSDK())
+    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();
       return NULL;
+    }
     g_sdk_initialized_via_pepper = true;
   }
 

pdf/pdf.gyp

@@ -11,6 +11,7 @@
         '../base/base.gyp:base',
         '../components/components.gyp:ui_zoom',
         '../content/content.gyp:content_common',
+        '../gin/gin.gyp:gin',
         '../net/net.gyp:net',
         '../ppapi/ppapi.gyp:ppapi_cpp_objects',
         '../ppapi/ppapi.gyp:ppapi_internal_module',