Merge to master: contention over isolate data slots

fpdfsdk/include/jsapi/fxjs_v8.h

 // 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
 
 // PDFium wrapper around V8 APIs. PDFium code should include this file rather
 // than including V8 headers directly.
 
 #ifndef FPDFSDK_INCLUDE_JSAPI_FXJS_V8_H_
 #define FPDFSDK_INCLUDE_JSAPI_FXJS_V8_H_
 
 #include <v8.h>
-#include "../../../core/include/fxcrt/fx_string.h"  // For CFX_WideString
+#include "../../../core/include/fxcrt/fx_basic.h"
+
+// FXJS_V8 places no interpretation on these two classes; it merely
+// passes them on to the caller-provided FXJS_CONSTRUCTORs.
+class IFXJS_Context;
+class IFXJS_Runtime;
 
 enum FXJSOBJTYPE {
   FXJS_DYNAMIC = 0,
   FXJS_STATIC = 1,
 };
 
 struct FXJSErr {
   const wchar_t* message;
   const wchar_t* srcline;
   unsigned linnum;
 };
 
+class FXJS_PerIsolateData {
+ public:
+  static void SetUp(v8::Isolate* pIsolate);
+  static FXJS_PerIsolateData* Get(v8::Isolate* pIsolate);
+
+  CFX_PtrArray m_ObjectDefnArray;
+  IFXJS_Runtime* m_pFXJSRuntime;
+
+ protected:
+  FXJS_PerIsolateData() : m_pFXJSRuntime(nullptr) {}
+};
+
 extern const wchar_t kFXJSValueNameString[];
 extern const wchar_t kFXJSValueNameNumber[];
 extern const wchar_t kFXJSValueNameBoolean[];
 extern const wchar_t kFXJSValueNameDate[];
 extern const wchar_t kFXJSValueNameObject[];
 extern const wchar_t kFXJSValueNameFxobj[];
 extern const wchar_t kFXJSValueNameNull[];
 extern const wchar_t kFXJSValueNameUndefined[];
 
-// FXJS_V8 places no interpretation on these two classes; it merely
-// passes them on to the caller-provided FXJS_CONSTRUCTORs.
-class IFXJS_Context;
-class IFXJS_Runtime;
 
 class FXJS_ArrayBufferAllocator : public v8::ArrayBuffer::Allocator {
   void* Allocate(size_t length) override;
   void* AllocateUninitialized(size_t length) override;
   void Free(void* data, size_t length) override;
 };
 
 using FXJS_CONSTRUCTOR = void (*)(IFXJS_Context* cc,
                                   v8::Local<v8::Object> obj,
                                   v8::Local<v8::Object> global);
@@ skipping 146 matching lines @@
 double FXJS_ToNumber(v8::Isolate* pIsolate, v8::Local<v8::Value> pValue);
 v8::Local<v8::Object> FXJS_ToObject(v8::Isolate* pIsolate,
                                     v8::Local<v8::Value> pValue);
 CFX_WideString FXJS_ToString(v8::Isolate* pIsolate,
                              v8::Local<v8::Value> pValue);
 v8::Local<v8::Array> FXJS_ToArray(v8::Isolate* pIsolate,
                                   v8::Local<v8::Value> pValue);
 void FXJS_ValueCopy(v8::Local<v8::Value>& pTo, v8::Local<v8::Value> pFrom);
 
 #endif  // FPDFSDK_INCLUDE_JSAPI_FXJS_V8_H_