summaryrefslogtreecommitdiff
path: root/fpdfsdk/include/jsapi
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2015-11-10 15:19:17 -0800
committerTom Sepez <tsepez@chromium.org>2015-11-10 15:19:17 -0800
commit4237aedc2efb0e7a8479148592af349addf86a89 (patch)
tree93bc2c19bfa39d9658836f364d8a22a4305bb736 /fpdfsdk/include/jsapi
parent4f4603cc1b498bca3b1619006137e50ce80088c1 (diff)
downloadpdfium-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/include/jsapi')
-rw-r--r--fpdfsdk/include/jsapi/fxjs_v8.h12
1 files changed, 7 insertions, 5 deletions
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<v8::Value> pDefault);
// Called after FXJS_Define* calls made.
-void FXJS_InitializeRuntime(v8::Isolate* pIsolate,
- IJS_Runtime* pIRuntime,
- v8::Global<v8::Context>& v8PersistentContext);
+void FXJS_InitializeRuntime(
+ v8::Isolate* pIsolate,
+ IJS_Runtime* pIRuntime,
+ v8::Global<v8::Context>* pV8PersistentContext,
+ std::vector<v8::Global<v8::Object>*>* pStaticObjects);
void FXJS_ReleaseRuntime(v8::Isolate* pIsolate,
- v8::Global<v8::Context>& v8PersistentContext);
+ v8::Global<v8::Context>* pV8PersistentContext,
+ std::vector<v8::Global<v8::Object>*>* pStaticObjects);
// Called as part of FXJS_InitializeRuntime, exposed so PDF can make its
// own contexts compatible with XFA or vice versa.