From 38a1f0a14bf17512f89bb5c7ed82847ba46456fa Mon Sep 17 00:00:00 2001 From: jochen Date: Tue, 31 May 2016 12:07:40 -0700 Subject: Fix V8 isolate setup in embedder tests and roll V8 to 055bfa7. R=thestig@chromium.org BUG= Review-Url: https://codereview.chromium.org/2019383002 --- testing/js_embedder_test.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'testing/js_embedder_test.cpp') diff --git a/testing/js_embedder_test.cpp b/testing/js_embedder_test.cpp index ffa647d073..4815cd54a3 100644 --- a/testing/js_embedder_test.cpp +++ b/testing/js_embedder_test.cpp @@ -5,17 +5,16 @@ #include "testing/js_embedder_test.h" JSEmbedderTest::JSEmbedderTest() - : m_pArrayBufferAllocator(new FXJS_ArrayBufferAllocator) { + : m_pArrayBufferAllocator(new FXJS_ArrayBufferAllocator), + m_pIsolate(nullptr) {} + +JSEmbedderTest::~JSEmbedderTest() {} + +void JSEmbedderTest::SetUp() { v8::Isolate::CreateParams params; params.array_buffer_allocator = m_pArrayBufferAllocator.get(); m_pIsolate = v8::Isolate::New(params); -} -JSEmbedderTest::~JSEmbedderTest() { - m_pIsolate->Dispose(); -} - -void JSEmbedderTest::SetUp() { EmbedderTest::SetExternalIsolate(m_pIsolate); EmbedderTest::SetUp(); @@ -34,6 +33,8 @@ void JSEmbedderTest::TearDown() { m_pPersistentContext.Reset(); FXJS_Release(); EmbedderTest::TearDown(); + m_pIsolate->Dispose(); + m_pIsolate = nullptr; } v8::Isolate* JSEmbedderTest::isolate() { -- cgit v1.2.3