diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-11-10 15:19:17 -0800 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-11-10 15:19:17 -0800 |
| commit | 4237aedc2efb0e7a8479148592af349addf86a89 (patch) | |
| tree | 93bc2c19bfa39d9658836f364d8a22a4305bb736 /fpdfsdk/src/jsapi/fxjs_v8_embeddertest.cpp | |
| parent | 4f4603cc1b498bca3b1619006137e50ce80088c1 (diff) | |
| download | pdfium-4237aedc2efb0e7a8479148592af349addf86a89.tar.xz | |
Merge to XFA: Keep "static" objects per-context rather than per isolate.
Original Review URL: https://codereview.chromium.org/1424933013 .
(cherry picked from commit 7d4c74d1b96d82681d49519c129262a1568e87d4)
TBR=jochen@chromium.org
Review URL: https://codereview.chromium.org/1407063012 .
Diffstat (limited to 'fpdfsdk/src/jsapi/fxjs_v8_embeddertest.cpp')
| -rw-r--r-- | fpdfsdk/src/jsapi/fxjs_v8_embeddertest.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fpdfsdk/src/jsapi/fxjs_v8_embeddertest.cpp b/fpdfsdk/src/jsapi/fxjs_v8_embeddertest.cpp index 01f12adb57..9cde507203 100644 --- a/fpdfsdk/src/jsapi/fxjs_v8_embeddertest.cpp +++ b/fpdfsdk/src/jsapi/fxjs_v8_embeddertest.cpp @@ -33,11 +33,12 @@ class FXJSV8Embeddertest : public EmbedderTest { v8::Locker locker(m_pIsolate); v8::HandleScope handle_scope(m_pIsolate); FXJS_PerIsolateData::SetUp(m_pIsolate); - FXJS_InitializeRuntime(m_pIsolate, nullptr, m_pPersistentContext); + FXJS_InitializeRuntime(m_pIsolate, nullptr, &m_pPersistentContext, + &m_StaticObjects); } void TearDown() override { - FXJS_ReleaseRuntime(m_pIsolate, m_pPersistentContext); + FXJS_ReleaseRuntime(m_pIsolate, &m_pPersistentContext, &m_StaticObjects); m_pPersistentContext.Reset(); FXJS_Release(); EmbedderTest::TearDown(); @@ -52,6 +53,7 @@ class FXJSV8Embeddertest : public EmbedderTest { nonstd::unique_ptr<FXJS_ArrayBufferAllocator> m_pArrayBufferAllocator; v8::Isolate* m_pIsolate; v8::Global<v8::Context> m_pPersistentContext; + std::vector<v8::Global<v8::Object>*> m_StaticObjects; }; TEST_F(FXJSV8Embeddertest, Getters) { |