Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / gin / isolate_holder.cc

diff --git a/src/gin/isolate_holder.cc b/src/gin/isolate_holder.cc
index d0ebbb8..00e9d84 100644 (file)
--- a/src/gin/isolate_holder.cc
+++ b/src/gin/isolate_holder.cc
@@ -8,76 +8,78 @@
 #include <string.h>
 
 #include "base/logging.h"
+#include "base/message_loop/message_loop.h"
 #include "base/rand_util.h"
 #include "base/sys_info.h"
 #include "gin/array_buffer.h"
+#include "gin/debug_impl.h"
 #include "gin/function_template.h"
 #include "gin/per_isolate_data.h"
 #include "gin/public/v8_platform.h"
+#include "gin/run_microtasks_observer.h"
 
 namespace gin {
 
 namespace {
 
+v8::ArrayBuffer::Allocator* g_array_buffer_allocator = NULL;
+
 bool GenerateEntropy(unsigned char* buffer, size_t amount) {
   base::RandBytes(buffer, amount);
   return true;
 }
 
-void EnsureV8Initialized(gin::IsolateHolder::ScriptMode mode,
-                         bool gin_managed) {
+}  // namespace
+
+IsolateHolder::IsolateHolder() {
+  CHECK(g_array_buffer_allocator)
+      << "You need to invoke gin::IsolateHolder::Initialize first";
+  v8::Isolate::CreateParams params;
+  params.entry_hook = DebugImpl::GetFunctionEntryHook();
+  params.code_event_handler = DebugImpl::GetJitCodeEventHandler();
+  params.constraints.ConfigureDefaults(base::SysInfo::AmountOfPhysicalMemory(),
+                                       base::SysInfo::AmountOfVirtualMemory(),
+                                       base::SysInfo::NumberOfProcessors());
+  isolate_ = v8::Isolate::New(params);
+  isolate_data_.reset(new PerIsolateData(isolate_, g_array_buffer_allocator));
+}
+
+IsolateHolder::~IsolateHolder() {
+  if (task_observer_.get())
+    base::MessageLoop::current()->RemoveTaskObserver(task_observer_.get());
+  isolate_data_.reset();
+  isolate_->Dispose();
+}
+
+// static
+void IsolateHolder::Initialize(ScriptMode mode,
+                               v8::ArrayBuffer::Allocator* allocator) {
+  CHECK(allocator);
   static bool v8_is_initialized = false;
-  static bool v8_is_gin_managed = false;
-  if (v8_is_initialized) {
-    CHECK_EQ(v8_is_gin_managed, gin_managed);
-    return;
-  }
-  v8_is_initialized = true;
-  v8_is_gin_managed = gin_managed;
-  if (!gin_managed)
+  if (v8_is_initialized)
     return;
-
   v8::V8::InitializePlatform(V8Platform::Get());
-  v8::V8::SetArrayBufferAllocator(ArrayBufferAllocator::SharedInstance());
+  v8::V8::SetArrayBufferAllocator(allocator);
+  g_array_buffer_allocator = allocator;
   if (mode == gin::IsolateHolder::kStrictMode) {
     static const char v8_flags[] = "--use_strict";
     v8::V8::SetFlagsFromString(v8_flags, sizeof(v8_flags) - 1);
   }
   v8::V8::SetEntropySource(&GenerateEntropy);
   v8::V8::Initialize();
+  v8_is_initialized = true;
 }
 
-}  // namespace
-
-IsolateHolder::IsolateHolder(ScriptMode mode)
-  : isolate_owner_(true) {
-  EnsureV8Initialized(mode, true);
-  isolate_ = v8::Isolate::New();
-  v8::ResourceConstraints constraints;
-  constraints.ConfigureDefaults(base::SysInfo::AmountOfPhysicalMemory(),
-                                base::SysInfo::AmountOfVirtualMemory(),
-                                base::SysInfo::NumberOfProcessors());
-  v8::SetResourceConstraints(isolate_, &constraints);
-  Init(ArrayBufferAllocator::SharedInstance());
-}
-
-IsolateHolder::IsolateHolder(v8::Isolate* isolate,
-                             v8::ArrayBuffer::Allocator* allocator)
-    : isolate_owner_(false), isolate_(isolate) {
-  EnsureV8Initialized(kNonStrictMode, false);
-  Init(allocator);
-}
-
-IsolateHolder::~IsolateHolder() {
-  isolate_data_.reset();
-  if (isolate_owner_)
-    isolate_->Dispose();
+void IsolateHolder::AddRunMicrotasksObserver() {
+  DCHECK(!task_observer_.get());
+  task_observer_.reset(new RunMicrotasksObserver(isolate_));;
+  base::MessageLoop::current()->AddTaskObserver(task_observer_.get());
 }
 
-void IsolateHolder::Init(v8::ArrayBuffer::Allocator* allocator) {
-  v8::Isolate::Scope isolate_scope(isolate_);
-  v8::HandleScope handle_scope(isolate_);
-  isolate_data_.reset(new PerIsolateData(isolate_, allocator));
+void IsolateHolder::RemoveRunMicrotasksObserver() {
+  DCHECK(task_observer_.get());
+  base::MessageLoop::current()->RemoveTaskObserver(task_observer_.get());
+  task_observer_.reset();
 }
 
 }  // namespace gin