summaryrefslogtreecommitdiff
path: root/fpdfsdk/src
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2015-10-06 08:53:13 -0700
committerTom Sepez <tsepez@chromium.org>2015-10-06 08:53:13 -0700
commit4ea721cb7954898a9722c389dae86c62957352d0 (patch)
treeeb28b9df824686b6adbc38b72329cb733ee0ba4b /fpdfsdk/src
parent5b3d0208723f21c50b9922bdc500c9d78c359a25 (diff)
downloadpdfium-4ea721cb7954898a9722c389dae86c62957352d0.tar.xz
Run FXJS_V8 embedder tests against a shared isolate.
Start to back-fill some tests for the recent isolate work. R=thestig@chromium.org Review URL: https://codereview.chromium.org/1377293004 .
Diffstat (limited to 'fpdfsdk/src')
-rw-r--r--fpdfsdk/src/jsapi/fxjs_v8_embeddertest.cpp24
1 files changed, 13 insertions, 11 deletions
diff --git a/fpdfsdk/src/jsapi/fxjs_v8_embeddertest.cpp b/fpdfsdk/src/jsapi/fxjs_v8_embeddertest.cpp
index 394933a9ff..187d611770 100644
--- a/fpdfsdk/src/jsapi/fxjs_v8_embeddertest.cpp
+++ b/fpdfsdk/src/jsapi/fxjs_v8_embeddertest.cpp
@@ -16,39 +16,41 @@ const wchar_t kScript[] = L"fred = 7";
class FXJSV8Embeddertest : public EmbedderTest {
public:
- FXJSV8Embeddertest() : m_pIsolate(nullptr) {}
- ~FXJSV8Embeddertest() override {}
+ FXJSV8Embeddertest()
+ : m_pArrayBufferAllocator(new FXJS_ArrayBufferAllocator) {
+ v8::Isolate::CreateParams params;
+ params.array_buffer_allocator = m_pArrayBufferAllocator.get();
+ m_pIsolate = v8::Isolate::New(params);
+ }
+
+ ~FXJSV8Embeddertest() override { m_pIsolate->Dispose(); }
void SetUp() override {
+ EmbedderTest::SetExternalIsolate(m_pIsolate);
EmbedderTest::SetUp();
- m_pAllocator.reset(new FXJS_ArrayBufferAllocator());
-
- v8::Isolate::CreateParams params;
- params.array_buffer_allocator = m_pAllocator.get();
- m_pIsolate = v8::Isolate::New(params);
v8::Isolate::Scope isolate_scope(m_pIsolate);
v8::HandleScope handle_scope(m_pIsolate);
- FXJS_Initialize(0, nullptr);
FXJS_PerIsolateData::SetUp(m_pIsolate);
FXJS_InitializeRuntime(m_pIsolate, nullptr, nullptr, m_pPersistentContext);
}
void TearDown() override {
FXJS_ReleaseRuntime(m_pIsolate, m_pPersistentContext);
+ m_pPersistentContext.Reset();
FXJS_Release();
EmbedderTest::TearDown();
}
- v8::Isolate* isolate() const { return m_pIsolate; }
+ v8::Isolate* isolate() { return m_pIsolate; }
v8::Local<v8::Context> GetV8Context() {
- return v8::Local<v8::Context>::New(m_pIsolate, m_pPersistentContext);
+ return m_pPersistentContext.Get(m_pIsolate);
}
private:
+ nonstd::unique_ptr<FXJS_ArrayBufferAllocator> m_pArrayBufferAllocator;
v8::Isolate* m_pIsolate;
v8::Global<v8::Context> m_pPersistentContext;
- nonstd::unique_ptr<FXJS_ArrayBufferAllocator> m_pAllocator;
};
TEST_F(FXJSV8Embeddertest, Getters) {