diff options
| author | jochen <jochen@chromium.org> | 2015-04-30 05:56:27 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-30 12:56:51 +0000 |
| commit | a0b121b54f40978bc03086fc771ba969b4bb7d1e (patch) | |
| tree | bf87bbeb3cdba2b2aa5c349ac7f258c0aabfb948 /gin | |
| parent | 39f5589fe34ed7d16059fec2d12f6bfcef193723 (diff) | |
| download | chromium_src-a0b121b54f40978bc03086fc771ba969b4bb7d1e.zip chromium_src-a0b121b54f40978bc03086fc771ba969b4bb7d1e.tar.gz chromium_src-a0b121b54f40978bc03086fc771ba969b4bb7d1e.tar.bz2 | |
Pass the ArrayBuffer::Allocator via the Isolate::CreateParams
BUG=none
R=dcarney@chromium.org
Review URL: https://codereview.chromium.org/1110333003
Cr-Commit-Position: refs/heads/master@{#327699}
Diffstat (limited to 'gin')
| -rw-r--r-- | gin/isolate_holder.cc | 3 | ||||
| -rw-r--r-- | gin/v8_initializer.cc | 6 | ||||
| -rw-r--r-- | gin/v8_initializer.h | 3 |
3 files changed, 4 insertions, 8 deletions
diff --git a/gin/isolate_holder.cc b/gin/isolate_holder.cc index 9a68e0f..2d7dcf7 100644 --- a/gin/isolate_holder.cc +++ b/gin/isolate_holder.cc @@ -34,6 +34,7 @@ IsolateHolder::IsolateHolder(AccessMode access_mode) params.code_event_handler = DebugImpl::GetJitCodeEventHandler(); params.constraints.ConfigureDefaults(base::SysInfo::AmountOfPhysicalMemory(), base::SysInfo::AmountOfVirtualMemory()); + params.array_buffer_allocator = allocator; isolate_ = v8::Isolate::New(params); isolate_data_.reset(new PerIsolateData(isolate_, allocator)); #if defined(OS_WIN) @@ -72,7 +73,7 @@ IsolateHolder::~IsolateHolder() { void IsolateHolder::Initialize(ScriptMode mode, v8::ArrayBuffer::Allocator* allocator) { CHECK(allocator); - gin::V8Initializer::Initialize(mode, allocator); + V8Initializer::Initialize(mode); g_array_buffer_allocator = allocator; } diff --git a/gin/v8_initializer.cc b/gin/v8_initializer.cc index a57afc9..40a7d1f 100644 --- a/gin/v8_initializer.cc +++ b/gin/v8_initializer.cc @@ -202,16 +202,12 @@ bool V8Initializer::OpenV8FilesForChildProcesses( #endif // V8_USE_EXTERNAL_STARTUP_DATA // static -void V8Initializer::Initialize(gin::IsolateHolder::ScriptMode mode, - v8::ArrayBuffer::Allocator* allocator) { - CHECK(allocator); - +void V8Initializer::Initialize(gin::IsolateHolder::ScriptMode mode) { static bool v8_is_initialized = false; if (v8_is_initialized) return; v8::V8::InitializePlatform(V8Platform::Get()); - v8::V8::SetArrayBufferAllocator(allocator); if (gin::IsolateHolder::kStrictMode == mode) { static const char use_strict[] = "--use_strict"; diff --git a/gin/v8_initializer.h b/gin/v8_initializer.h index 6c9c6c2..68068c4 100644 --- a/gin/v8_initializer.h +++ b/gin/v8_initializer.h @@ -21,8 +21,7 @@ class GIN_EXPORT V8Initializer { static const char kSnapshotFileName[]; // This should be called by IsolateHolder::Initialize(). - static void Initialize(gin::IsolateHolder::ScriptMode mode, - v8::ArrayBuffer::Allocator* allocator); + static void Initialize(gin::IsolateHolder::ScriptMode mode); // Get address and size information for currently loaded snapshot. // If no snapshot is loaded, the return values are null for addresses |