summaryrefslogtreecommitdiff
path: root/fpdfsdk/src/javascript
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2015-09-15 14:03:52 -0700
committerTom Sepez <tsepez@chromium.org>2015-09-15 14:03:52 -0700
commit09ed30750282bf56a92d0e646ab22c64bea81a36 (patch)
tree919cf39ff0c0688589a9db2521bce07abf16ed8f /fpdfsdk/src/javascript
parent72d51871ae152163eeb9b005fd0a74d5c1651cd2 (diff)
downloadpdfium-09ed30750282bf56a92d0e646ab22c64bea81a36.tar.xz
Refactor fxjs_v8 and add embeddertests for it.
This forces the layer defined by fxjs_v8.h to be (more) self-contained, so that it can be tested apart from the CJS_* objects (in fpdfsdk/{src,include}/javascript. This implies the array buffer allocator must be part of fxjs_v8. One wrinkle is that we'd like to be able to test an isolate upon which no native objects have been added, so some initialization that would have occurred as part of object definition must be made explicit. R=thestig@chromium.org Review URL: https://codereview.chromium.org/1338073002 .
Diffstat (limited to 'fpdfsdk/src/javascript')
-rw-r--r--fpdfsdk/src/javascript/JS_Runtime.cpp31
1 files changed, 6 insertions, 25 deletions
diff --git a/fpdfsdk/src/javascript/JS_Runtime.cpp b/fpdfsdk/src/javascript/JS_Runtime.cpp
index 8ba7e81654..37b0d353e2 100644
--- a/fpdfsdk/src/javascript/JS_Runtime.cpp
+++ b/fpdfsdk/src/javascript/JS_Runtime.cpp
@@ -30,24 +30,14 @@
CJS_RuntimeFactory::~CJS_RuntimeFactory() {}
IFXJS_Runtime* CJS_RuntimeFactory::NewJSRuntime(CPDFDoc_Environment* pApp) {
- if (!m_bInit) {
- unsigned int embedderDataSlot = 0;
- if (pApp->GetFormFillInfo()->m_pJsPlatform->version >= 2) {
- embedderDataSlot =
- pApp->GetFormFillInfo()->m_pJsPlatform->m_v8EmbedderSlot;
- }
- JS_Initial(embedderDataSlot);
- m_bInit = TRUE;
- }
+ m_bInit = true;
return new CJS_Runtime(pApp);
}
void CJS_RuntimeFactory::AddRef() {
- // to do.Should be implemented as atom manipulation.
m_nRef++;
}
void CJS_RuntimeFactory::Release() {
if (m_bInit) {
- // to do.Should be implemented as atom manipulation.
if (--m_nRef == 0) {
JS_Release();
m_bInit = FALSE;
@@ -59,18 +49,6 @@ void CJS_RuntimeFactory::DeleteJSRuntime(IFXJS_Runtime* pRuntime) {
delete (CJS_Runtime*)pRuntime;
}
-void* CJS_ArrayBufferAllocator::Allocate(size_t length) {
- return calloc(1, length);
-}
-
-void* CJS_ArrayBufferAllocator::AllocateUninitialized(size_t length) {
- return malloc(length);
-}
-
-void CJS_ArrayBufferAllocator::Free(void* data, size_t length) {
- free(data);
-}
-
/* ------------------------------ CJS_Runtime ------------------------------ */
CJS_Runtime::CJS_Runtime(CPDFDoc_Environment* pApp)
@@ -80,12 +58,14 @@ CJS_Runtime::CJS_Runtime(CPDFDoc_Environment* pApp)
m_pFieldEventPath(NULL),
m_isolate(NULL),
m_isolateManaged(false) {
+ unsigned int embedderDataSlot = 0;
if (m_pApp->GetFormFillInfo()->m_pJsPlatform->version >= 2) {
m_isolate = reinterpret_cast<v8::Isolate*>(
m_pApp->GetFormFillInfo()->m_pJsPlatform->m_isolate);
+ embedderDataSlot = pApp->GetFormFillInfo()->m_pJsPlatform->m_v8EmbedderSlot;
}
if (!m_isolate) {
- m_pArrayBufferAllocator.reset(new CJS_ArrayBufferAllocator());
+ m_pArrayBufferAllocator.reset(new JS_ArrayBufferAllocator());
v8::Isolate::CreateParams params;
params.array_buffer_allocator = m_pArrayBufferAllocator.get();
@@ -93,10 +73,11 @@ CJS_Runtime::CJS_Runtime(CPDFDoc_Environment* pApp)
m_isolateManaged = true;
}
+ JS_Initialize(embedderDataSlot);
DefineJSObjects();
CJS_Context* pContext = (CJS_Context*)NewContext();
- JS_InitialRuntime(GetIsolate(), this, pContext, m_context);
+ JS_InitializeRuntime(GetIsolate(), this, pContext, m_context);
ReleaseContext(pContext);
}