summaryrefslogtreecommitdiff
path: root/fpdfsdk/src
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2015-04-30 15:19:03 -0700
committerTom Sepez <tsepez@chromium.org>2015-04-30 15:19:03 -0700
commitd2cc1b90fe1ffd3162bb685a3f120f867220b5e9 (patch)
treed3004cd4b3e7c1296fbbdacc7cd68c6c4473655a /fpdfsdk/src
parent134eb282dfaf1e3903979d397db6433966837687 (diff)
downloadpdfium-d2cc1b90fe1ffd3162bb685a3f120f867220b5e9.tar.xz
Merge to XFA: Fix V8 array buffer allocator.
R=thestig@chromium.org Review URL: https://codereview.chromium.org/1118143003
Diffstat (limited to 'fpdfsdk/src')
-rw-r--r--fpdfsdk/src/javascript/JS_Runtime.cpp27
1 files changed, 23 insertions, 4 deletions
diff --git a/fpdfsdk/src/javascript/JS_Runtime.cpp b/fpdfsdk/src/javascript/JS_Runtime.cpp
index 4b4328c701..2ad5667b2e 100644
--- a/fpdfsdk/src/javascript/JS_Runtime.cpp
+++ b/fpdfsdk/src/javascript/JS_Runtime.cpp
@@ -93,17 +93,36 @@ void CJS_RuntimeFactory::ReleaseGlobalData()
}
}
+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 ------------------------------ */
extern v8::Persistent<v8::ObjectTemplate>& _getGlobalObjectTemplate(IJS_Runtime* pJSRuntime);
CJS_Runtime::CJS_Runtime(CPDFDoc_Environment* pApp) :
m_pApp(pApp),
m_pDocument(NULL),
m_bBlocking(FALSE),
- m_pFieldEventPath(NULL),
- m_bRegistered(FALSE)
+ m_bRegistered(FALSE),
+ m_pFieldEventPath(NULL)
{
- m_isolate = FPDFXFA_GetApp()->GetJSERuntime()?(v8::Isolate*)FPDFXFA_GetApp()->GetJSERuntime():v8::Isolate::New();
- //m_isolate->Enter();
+ if (FPDFXFA_GetApp()->GetJSERuntime()) {
+ m_isolate = (v8::Isolate*)FPDFXFA_GetApp()->GetJSERuntime();
+ } else {
+ m_pArrayBufferAllocator.reset(new CJS_ArrayBufferAllocator());
+ v8::Isolate::CreateParams params;
+ params.array_buffer_allocator = m_pArrayBufferAllocator.get();
+ m_isolate = v8::Isolate::New(params);
+ }
+
v8::Isolate* isolate = m_isolate;
v8::Isolate::Scope isolate_scope(isolate);
v8::Locker locker(isolate);