Merge to XFA: Fix V8 array buffer allocator.

fpdfsdk/src/javascript/JS_Runtime.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "../../include/javascript/JavaScript.h"
 #include "../../include/javascript/IJavaScript.h"
 #include "../../include/javascript/JS_EventHandler.h"
 #include "../../include/javascript/JS_Runtime.h"
@@ skipping 75 matching lines @@
 {
         m_nGlobalDataCount--;
         
         if (m_nGlobalDataCount <= 0)
         {
                 delete m_pGlobalData;
                 m_pGlobalData = NULL;
         }
 }
 
+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);
         v8::HandleScope handle_scope(isolate);
         if (FPDFXFA_GetApp()->InitRuntime(FALSE)) {
                 CJS_Context * pContext = (CJS_Context*)NewContext();
                 JS_InitialRuntime(*this, this, pContext, m_context);
                 ReleaseContext(pContext);
                 return;
         }
@@ skipping 258 matching lines @@
     v8::Local<v8::Context> context =
         v8::Local<v8::Context>::New(pIsolate, m_context);
     v8::Context::Scope context_scope(context);
 
         //v8::Local<v8::Context> tmpCotext = v8::Local<v8::Context>::New(GetIsolate(), m_context);
         v8::Local<v8::Value> propvalue = v8::Local<v8::Value>::New(GetIsolate(),((CFXJSE_Value*)hValue)->DirectGetValue());
         context->Global()->Set(v8::String::NewFromUtf8(pIsolate, name, v8::String::kNormalString, utf8Name.GetLength()), propvalue);
          
         return TRUE;
 }