| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "gin/test/v8_test.h" | 5 #include "gin/test/v8_test.h" |
| 6 | 6 |
| 7 #include "gin/array_buffer.h" | 7 #include "gin/array_buffer.h" |
| 8 #include "gin/public/isolate_holder.h" | 8 #include "gin/public/isolate_holder.h" |
| 9 | 9 #include "gin/v8_initializer.h" |
| 10 #ifdef V8_USE_EXTERNAL_STARTUP_DATA | |
| 11 #include "gin/public/isolate_holder.h" | |
| 12 #endif | |
| 13 | 10 |
| 14 using v8::Context; | 11 using v8::Context; |
| 15 using v8::Local; | 12 using v8::Local; |
| 16 using v8::HandleScope; | 13 using v8::HandleScope; |
| 17 | 14 |
| 18 namespace gin { | 15 namespace gin { |
| 19 | 16 |
| 20 V8Test::V8Test() { | 17 V8Test::V8Test() { |
| 21 } | 18 } |
| 22 | 19 |
| 23 V8Test::~V8Test() { | 20 V8Test::~V8Test() { |
| 24 } | 21 } |
| 25 | 22 |
| 26 void V8Test::SetUp() { | 23 void V8Test::SetUp() { |
| 27 #ifdef V8_USE_EXTERNAL_STARTUP_DATA | 24 #ifdef V8_USE_EXTERNAL_STARTUP_DATA |
| 28 gin::IsolateHolder::LoadV8Snapshot(); | 25 gin::V8Initializer::LoadV8Snapshot(); |
| 29 #endif | 26 #endif |
| 30 gin::IsolateHolder::Initialize(gin::IsolateHolder::kStrictMode, | 27 gin::V8Initializer::Initialize(gin::V8Initializer::kStrictMode, |
| 31 gin::ArrayBufferAllocator::SharedInstance()); | 28 gin::ArrayBufferAllocator::SharedInstance()); |
| 29 |
| 32 instance_.reset(new gin::IsolateHolder); | 30 instance_.reset(new gin::IsolateHolder); |
| 33 instance_->isolate()->Enter(); | 31 instance_->isolate()->Enter(); |
| 34 HandleScope handle_scope(instance_->isolate()); | 32 HandleScope handle_scope(instance_->isolate()); |
| 35 context_.Reset(instance_->isolate(), Context::New(instance_->isolate())); | 33 context_.Reset(instance_->isolate(), Context::New(instance_->isolate())); |
| 36 Local<Context>::New(instance_->isolate(), context_)->Enter(); | 34 Local<Context>::New(instance_->isolate(), context_)->Enter(); |
| 37 } | 35 } |
| 38 | 36 |
| 39 void V8Test::TearDown() { | 37 void V8Test::TearDown() { |
| 40 { | 38 { |
| 41 HandleScope handle_scope(instance_->isolate()); | 39 HandleScope handle_scope(instance_->isolate()); |
| 42 Local<Context>::New(instance_->isolate(), context_)->Exit(); | 40 Local<Context>::New(instance_->isolate(), context_)->Exit(); |
| 43 context_.Reset(); | 41 context_.Reset(); |
| 44 } | 42 } |
| 45 instance_->isolate()->Exit(); | 43 instance_->isolate()->Exit(); |
| 46 instance_.reset(); | 44 instance_.reset(); |
| 47 } | 45 } |
| 48 | 46 |
| 49 } // namespace gin | 47 } // namespace gin |
| OLD | NEW |