diff options
author | Tom Sepez <tsepez@chromium.org> | 2015-09-15 15:30:34 -0700 |
---|---|---|
committer | Tom Sepez <tsepez@chromium.org> | 2015-09-15 15:30:34 -0700 |
commit | 7d0fcbf8198f04a5a5bd15482fdbdae919fb1891 (patch) | |
tree | 61817fe7a1fa74c00a7610e8537df62f13e0d8f8 /fpdfsdk/src/jsapi/fxjs_v8.cpp | |
parent | 5eb8ba2ef43bac9c8fb96f75357b21b0dbeefe80 (diff) | |
download | pdfium-7d0fcbf8198f04a5a5bd15482fdbdae919fb1891.tar.xz |
Merge to XFA: Refactor fxjs_v8 and add embeddertests for it.
(cherry picked from commit b17d62601b21dfce85718e08cfd0ffce3a45d74e)
(cherry picked from commit 09ed30750282bf56a92d0e646ab22c64bea81a36)
Manual edits:
fpdfsdk/src/jsapi/fxjs_v8_embeddertest.cpp - add lockers.
fppdfsdk/src/javascript/JS_Runtime.cpp - rework XFA init path.
Original Review URL: https://codereview.chromium.org/1338073002 .
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1348433002 .
Diffstat (limited to 'fpdfsdk/src/jsapi/fxjs_v8.cpp')
-rw-r--r-- | fpdfsdk/src/jsapi/fxjs_v8.cpp | 33 |
1 files changed, 24 insertions, 9 deletions
diff --git a/fpdfsdk/src/jsapi/fxjs_v8.cpp b/fpdfsdk/src/jsapi/fxjs_v8.cpp index b0fd6fbb9f..135b5e9349 100644 --- a/fpdfsdk/src/jsapi/fxjs_v8.cpp +++ b/fpdfsdk/src/jsapi/fxjs_v8.cpp @@ -75,6 +75,23 @@ class CJS_ObjDefintion { v8::Global<v8::Object> m_StaticObj; }; +void* JS_ArrayBufferAllocator::Allocate(size_t length) { + return calloc(1, length); +} + +void* JS_ArrayBufferAllocator::AllocateUninitialized(size_t length) { + return malloc(length); +} + +void JS_ArrayBufferAllocator::Free(void* data, size_t length) { + free(data); +} + +void JS_PrepareIsolate(v8::Isolate* pIsolate) { + if (!pIsolate->GetData(g_embedderDataSlot)) + pIsolate->SetData(g_embedderDataSlot, new CFX_PtrArray()); +} + int JS_DefineObj(v8::Isolate* pIsolate, const wchar_t* sObjName, FXJSOBJTYPE eObjType, @@ -82,11 +99,9 @@ int JS_DefineObj(v8::Isolate* pIsolate, LP_DESTRUCTOR pDestructor) { v8::Isolate::Scope isolate_scope(pIsolate); v8::HandleScope handle_scope(pIsolate); + + JS_PrepareIsolate(pIsolate); CFX_PtrArray* pArray = (CFX_PtrArray*)pIsolate->GetData(g_embedderDataSlot); - if (!pArray) { - pArray = new CFX_PtrArray(); - pIsolate->SetData(g_embedderDataSlot, pArray); - } CJS_ObjDefintion* pObjDef = new CJS_ObjDefintion(pIsolate, sObjName, eObjType, pConstructor, pDestructor); pArray->Add(pObjDef); @@ -243,10 +258,10 @@ void JS_DefineGlobalConst(v8::Isolate* pIsolate, globalObjTemp.Reset(pIsolate, objTemp); } -void JS_InitialRuntime(v8::Isolate* pIsolate, - IFXJS_Runtime* pFXRuntime, - IFXJS_Context* context, - v8::Global<v8::Context>& v8PersistentContext) { +void JS_InitializeRuntime(v8::Isolate* pIsolate, + IFXJS_Runtime* pFXRuntime, + IFXJS_Context* context, + v8::Global<v8::Context>& v8PersistentContext) { v8::Isolate::Scope isolate_scope(pIsolate); v8::Locker locker(pIsolate); v8::HandleScope handle_scope(pIsolate); @@ -340,7 +355,7 @@ void JS_ReleaseRuntime(v8::Isolate* pIsolate, pIsolate->SetData(2, NULL); } -void JS_Initial(unsigned int embedderDataSlot) { +void JS_Initialize(unsigned int embedderDataSlot) { g_embedderDataSlot = embedderDataSlot; } |