Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(265)

Side by Side Diff: testing/js_embedder_test.cpp

Issue 2245863002: Push v8::Isolate into CFXJS_Engine class (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Null isolate before letting CFXJS_Engine dtor invoked Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « testing/js_embedder_test.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 PDFium Authors. All rights reserved. 1 // Copyright 2015 PDFium 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 "testing/js_embedder_test.h" 5 #include "testing/js_embedder_test.h"
6 6
7 JSEmbedderTest::JSEmbedderTest() 7 JSEmbedderTest::JSEmbedderTest()
8 : m_pArrayBufferAllocator(new FXJS_ArrayBufferAllocator), 8 : m_pArrayBufferAllocator(new FXJS_ArrayBufferAllocator),
9 m_pIsolate(nullptr) {} 9 m_pIsolate(nullptr) {}
10 10
11 JSEmbedderTest::~JSEmbedderTest() {} 11 JSEmbedderTest::~JSEmbedderTest() {}
12 12
13 void JSEmbedderTest::SetUp() { 13 void JSEmbedderTest::SetUp() {
14 v8::Isolate::CreateParams params; 14 v8::Isolate::CreateParams params;
15 params.array_buffer_allocator = m_pArrayBufferAllocator.get(); 15 params.array_buffer_allocator = m_pArrayBufferAllocator.get();
16 m_pIsolate = v8::Isolate::New(params); 16 m_pIsolate = v8::Isolate::New(params);
17 17
18 EmbedderTest::SetExternalIsolate(m_pIsolate); 18 EmbedderTest::SetExternalIsolate(m_pIsolate);
19 EmbedderTest::SetUp(); 19 EmbedderTest::SetUp();
20 20
21 v8::Isolate::Scope isolate_scope(m_pIsolate); 21 v8::Isolate::Scope isolate_scope(m_pIsolate);
22 v8::HandleScope handle_scope(m_pIsolate); 22 v8::HandleScope handle_scope(m_pIsolate);
23 FXJS_PerIsolateData::SetUp(m_pIsolate); 23 FXJS_PerIsolateData::SetUp(m_pIsolate);
24 FXJS_InitializeEngine(m_pIsolate, nullptr, &m_pPersistentContext, 24 m_Engine.reset(new CFXJS_Engine);
25 &m_StaticObjects); 25 m_Engine->SetIsolate(m_pIsolate);
26 m_Engine->InitializeEngine();
26 } 27 }
27 28
28 void JSEmbedderTest::TearDown() { 29 void JSEmbedderTest::TearDown() {
29 FXJS_ReleaseEngine(m_pIsolate, &m_pPersistentContext, &m_StaticObjects); 30 m_Engine->ReleaseEngine();
30 m_pPersistentContext.Reset(); 31 m_Engine.reset();
31 EmbedderTest::TearDown(); 32 EmbedderTest::TearDown();
32 m_pIsolate->Dispose(); 33 m_pIsolate->Dispose();
33 m_pIsolate = nullptr; 34 m_pIsolate = nullptr;
34 } 35 }
35 36
36 v8::Isolate* JSEmbedderTest::isolate() { 37 v8::Isolate* JSEmbedderTest::isolate() {
37 return m_pIsolate; 38 return m_pIsolate;
38 } 39 }
39 40
40 v8::Local<v8::Context> JSEmbedderTest::GetV8Context() { 41 v8::Local<v8::Context> JSEmbedderTest::GetV8Context() {
41 return m_pPersistentContext.Get(m_pIsolate); 42 return m_Engine->GetPersistentContext();
42 } 43 }
OLDNEW
« no previous file with comments | « testing/js_embedder_test.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698