From 4237aedc2efb0e7a8479148592af349addf86a89 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Tue, 10 Nov 2015 15:19:17 -0800 Subject: 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 . --- fpdfsdk/include/jsapi/fxjs_v8.h | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'fpdfsdk/include/jsapi') diff --git a/fpdfsdk/include/jsapi/fxjs_v8.h b/fpdfsdk/include/jsapi/fxjs_v8.h index 001823f5fd..3b5e6af180 100644 --- a/fpdfsdk/include/jsapi/fxjs_v8.h +++ b/fpdfsdk/include/jsapi/fxjs_v8.h @@ -64,7 +64,6 @@ extern const wchar_t kFXJSValueNameFxobj[]; extern const wchar_t kFXJSValueNameNull[]; extern const wchar_t kFXJSValueNameUndefined[]; - class FXJS_ArrayBufferAllocator : public v8::ArrayBuffer::Allocator { void* Allocate(size_t length) override; void* AllocateUninitialized(size_t length) override; @@ -128,11 +127,14 @@ void FXJS_DefineGlobalConst(v8::Isolate* pIsolate, v8::Local pDefault); // Called after FXJS_Define* calls made. -void FXJS_InitializeRuntime(v8::Isolate* pIsolate, - IJS_Runtime* pIRuntime, - v8::Global& v8PersistentContext); +void FXJS_InitializeRuntime( + v8::Isolate* pIsolate, + IJS_Runtime* pIRuntime, + v8::Global* pV8PersistentContext, + std::vector*>* pStaticObjects); void FXJS_ReleaseRuntime(v8::Isolate* pIsolate, - v8::Global& v8PersistentContext); + v8::Global* pV8PersistentContext, + std::vector*>* pStaticObjects); // Called as part of FXJS_InitializeRuntime, exposed so PDF can make its // own contexts compatible with XFA or vice versa. -- cgit v1.2.3