From 7dfe5929282cb6d78d7b5e32e1d72e9db99d3066 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Sun, 4 Oct 2015 20:40:15 -0700 Subject: Only call DefineJSObjects() once for the global V8 isolate. BUG=539106 R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1386823002 . --- fpdfsdk/src/javascript/JS_Runtime.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'fpdfsdk/src/javascript') diff --git a/fpdfsdk/src/javascript/JS_Runtime.cpp b/fpdfsdk/src/javascript/JS_Runtime.cpp index 4c502a7b75..707551adbe 100644 --- a/fpdfsdk/src/javascript/JS_Runtime.cpp +++ b/fpdfsdk/src/javascript/JS_Runtime.cpp @@ -45,7 +45,8 @@ CJS_Runtime::CJS_Runtime(CPDFDoc_Environment* pApp) FXJS_Initialize(embedderDataSlot, pExternalIsolate); } m_isolateManaged = FXJS_GetIsolate(&m_isolate); - DefineJSObjects(); + if (m_isolateManaged || FXJS_GlobalIsolateRefCount() == 0) + DefineJSObjects(); CJS_Context* pContext = (CJS_Context*)NewContext(); FXJS_InitializeRuntime(GetIsolate(), this, pContext, m_context); -- cgit v1.2.3