Chromium Code Reviews| Index: fpdfsdk/src/javascript/JS_Runtime.cpp |
| diff --git a/fpdfsdk/src/javascript/JS_Runtime.cpp b/fpdfsdk/src/javascript/JS_Runtime.cpp |
| index 1e1486df5c796f6578c07eb71e942b2747c9d32f..5c463ce498803081c76c4debacf635f775db6cc4 100644 |
| --- a/fpdfsdk/src/javascript/JS_Runtime.cpp |
| +++ b/fpdfsdk/src/javascript/JS_Runtime.cpp |
| @@ -35,22 +35,17 @@ CJS_Runtime::CJS_Runtime(CPDFDoc_Environment* pApp) |
| m_bBlocking(FALSE), |
| 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 FXJS_ArrayBufferAllocator()); |
| - |
| - v8::Isolate::CreateParams params; |
| - params.array_buffer_allocator = m_pArrayBufferAllocator.get(); |
| - m_isolate = v8::Isolate::New(params); |
| - m_isolateManaged = true; |
| + IPDF_JSPLATFORM* pPlatform = m_pApp->GetFormFillInfo()->m_pJsPlatform; |
| + if (pPlatform->version <= 2) { |
|
Lei Zhang
2015/10/02 22:02:15
Can you mention this is the deprecated way and mar
Tom Sepez
2015/10/02 22:46:50
Oh yes, once chrome catches up, using v2 is going
|
| + unsigned int embedderDataSlot = 0; |
| + v8::Isolate* pExternalIsolate = nullptr; |
| + if (pPlatform->version == 2) { |
| + pExternalIsolate = reinterpret_cast<v8::Isolate*>(pPlatform->m_isolate); |
| + embedderDataSlot = pPlatform->m_v8EmbedderSlot; |
| + } |
| + FXJS_Initialize(embedderDataSlot, pExternalIsolate); |
| } |
| - |
| - FXJS_Initialize(embedderDataSlot); |
| + m_isolateManaged = FXJS_GetIsolate(&m_isolate); |
| DefineJSObjects(); |
| CJS_Context* pContext = (CJS_Context*)NewContext(); |