Remove use of v8:Lockers

fpdfsdk/javascript/cjs_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 "fpdfsdk/javascript/cjs_runtime.h"
 
 #include <algorithm>
 
@@ skipping 70 matching lines @@
 #endif
     }
 #ifndef PDF_ENABLE_XFA
     FXJS_Initialize(embedderDataSlot, pExternalIsolate);
 #else
     m_isolateManaged = FXJS_GetIsolate(&m_isolate);
   }
 
   v8::Isolate* isolate = m_isolate;
   v8::Isolate::Scope isolate_scope(isolate);
-  v8::Locker locker(isolate);
   v8::HandleScope handle_scope(isolate);
   if (CPDFXFA_App::GetInstance()->IsJavaScriptInitialized()) {
     CJS_Context* pContext = (CJS_Context*)NewContext();
     FXJS_InitializeRuntime(GetIsolate(), this, &m_context, &m_StaticObjects);
     ReleaseContext(pContext);
     return;
 #endif
   }
 #ifndef PDF_ENABLE_XFA
   m_isolateManaged = FXJS_GetIsolate(&m_isolate);
@@ skipping 19 matching lines @@
   m_ContextArray.clear();
   m_ConstArrays.clear();
   FXJS_ReleaseRuntime(GetIsolate(), &m_context, &m_StaticObjects);
   m_context.Reset();
   if (m_isolateManaged)
     m_isolate->Dispose();
 }
 
 void CJS_Runtime::DefineJSObjects() {
   v8::Isolate::Scope isolate_scope(GetIsolate());
-#ifdef PDF_ENABLE_XFA
-  v8::Locker locker(GetIsolate());
-#endif
   v8::HandleScope handle_scope(GetIsolate());
   v8::Local<v8::Context> context = v8::Context::New(GetIsolate());
   v8::Context::Scope context_scope(context);
 
   // The call order determines the "ObjDefID" assigned to each class.
   // ObjDefIDs 0 - 2
   CJS_Border::DefineJSObjects(GetIsolate(), FXJSOBJTYPE_STATIC);
   CJS_Display::DefineJSObjects(GetIsolate(), FXJSOBJTYPE_STATIC);
   CJS_Font::DefineJSObjects(GetIsolate(), FXJSOBJTYPE_STATIC);
 
@@ skipping 46 matching lines @@
   }
 }
 
 IJS_Context* CJS_Runtime::GetCurrentContext() {
   return m_ContextArray.empty() ? nullptr : m_ContextArray.back().get();
 }
 
 void CJS_Runtime::SetReaderDocument(CPDFSDK_Document* pReaderDoc) {
   if (m_pDocument != pReaderDoc) {
     v8::Isolate::Scope isolate_scope(m_isolate);
-#ifdef PDF_ENABLE_XFA
-    v8::Locker locker(m_isolate);
-#endif
     v8::HandleScope handle_scope(m_isolate);
     v8::Local<v8::Context> context =
         v8::Local<v8::Context>::New(m_isolate, m_context);
     v8::Context::Scope context_scope(context);
 
     m_pDocument = pReaderDoc;
     if (pReaderDoc) {
       v8::Local<v8::Object> pThis = FXJS_GetThisObj(GetIsolate());
       if (!pThis.IsEmpty()) {
         if (FXJS_GetObjDefnID(pThis) == CJS_Document::g_nObjDefnID) {
@@ skipping 45 matching lines @@
 CFX_WideString ChangeObjName(const CFX_WideString& str) {
   CFX_WideString sRet = str;
   sRet.Replace(L"_", L".");
   return sRet;
 }
 FX_BOOL CJS_Runtime::GetValueByName(const CFX_ByteStringC& utf8Name,
                                     CFXJSE_Value* pValue) {
 #ifdef PDF_ENABLE_XFA
   const FX_CHAR* name = utf8Name.c_str();
 
-  v8::Locker lock(GetIsolate());
   v8::Isolate::Scope isolate_scope(GetIsolate());
   v8::HandleScope handle_scope(GetIsolate());
   v8::Local<v8::Context> old_context = GetIsolate()->GetCurrentContext();
   v8::Local<v8::Context> context =
       v8::Local<v8::Context>::New(GetIsolate(), m_context);
   v8::Context::Scope context_scope(context);
 
   // Caution: We're about to hand to XFA an object that in order to invoke
   // methods will require that the current v8::Context always has a pointer
   // to a CJS_Runtime in its embedder data slot. Unfortunately, XFA creates
@@ skipping 16 matching lines @@
 
   return TRUE;
 }
 FX_BOOL CJS_Runtime::SetValueByName(const CFX_ByteStringC& utf8Name,
                                     CFXJSE_Value* pValue) {
 #ifdef PDF_ENABLE_XFA
   if (utf8Name.IsEmpty() || !pValue)
     return FALSE;
   const FX_CHAR* name = utf8Name.c_str();
   v8::Isolate* pIsolate = GetIsolate();
-  v8::Locker lock(pIsolate);
   v8::Isolate::Scope isolate_scope(pIsolate);
   v8::HandleScope handle_scope(pIsolate);
   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(), pValue->DirectGetValue());
   context->Global()->Set(
       v8::String::NewFromUtf8(pIsolate, name, v8::String::kNormalString,
                               utf8Name.GetLength()),
       propvalue);
 #endif
   return TRUE;
 }
 
 #endif
 void CJS_Runtime::AddObserver(Observer* observer) {
   ASSERT(!pdfium::ContainsKey(m_observers, observer));
   m_observers.insert(observer);
 }
 
 void CJS_Runtime::RemoveObserver(Observer* observer) {
   ASSERT(pdfium::ContainsKey(m_observers, observer));
   m_observers.erase(observer);
 }