Merge to XFA: Rename CFXJS_PrivateData to CFXJS_PerObjectData.

fpdfsdk/src/jsapi/fxjs_v8.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/jsapi/fxjs_v8.h"
 
 #include "../../../core/include/fxcrt/fx_basic.h"
 
@@ skipping 10 matching lines @@
 // (without actually requiring a dependency on gin itself for the standalone
 // embedders of PDFIum). The value we want to use is:
 //   kPerContextDataStartIndex + kEmbedderPDFium, which is 3.
 static const unsigned int kPerContextDataIndex = 3u;
 static unsigned int g_embedderDataSlot = 1u;
 static v8::Isolate* g_isolate = nullptr;
 static size_t g_isolate_ref_count = 0;
 static FXJS_ArrayBufferAllocator* g_arrayBufferAllocator = nullptr;
 static v8::Global<v8::ObjectTemplate>* g_DefaultGlobalObjectTemplate = nullptr;
 
-class CFXJS_PrivateData {
+class CFXJS_PerObjectData {
  public:
-  CFXJS_PrivateData(int nObjDefID) : ObjDefID(nObjDefID), pPrivate(NULL) {}
+  CFXJS_PerObjectData(int nObjDefID)
+      : m_ObjDefID(nObjDefID), m_pPrivate(nullptr) {}
 
-  int ObjDefID;
-  void* pPrivate;
+  int m_ObjDefID;
+  void* m_pPrivate;
 };
 
 class CFXJS_ObjDefinition {
  public:
   static int MaxID(v8::Isolate* pIsolate) {
     return static_cast<int>(
         FXJS_PerIsolateData::Get(pIsolate)->m_ObjectDefnArray.GetSize());
   }
   static CFXJS_ObjDefinition* ForID(v8::Isolate* pIsolate, int id) {
     // Note: GetAt() halts if out-of-range even in release builds.
@@ skipping 248 matching lines @@
     v8::Local<v8::String> m_ObjName =
         v8::String::NewFromUtf8(pIsolate, bs.c_str(),
                                 v8::NewStringType::kNormal,
                                 bs.GetLength()).ToLocalChecked();
 
     if (pObjDef->m_ObjType == FXJSOBJTYPE_GLOBAL) {
       v8Context->Global()
           ->GetPrototype()
           ->ToObject(v8Context)
           .ToLocalChecked()
-          ->SetAlignedPointerInInternalField(0, new CFXJS_PrivateData(i));
+          ->SetAlignedPointerInInternalField(0, new CFXJS_PerObjectData(i));
 
       if (pObjDef->m_pConstructor)
         pObjDef->m_pConstructor(pIRuntime, v8Context->Global()
                                                ->GetPrototype()
                                                ->ToObject(v8Context)
                                                .ToLocalChecked());
     } else if (pObjDef->m_ObjType == FXJSOBJTYPE_STATIC) {
       v8::Local<v8::Object> obj = FXJS_NewFxDynamicObj(pIsolate, pIRuntime, i);
       v8Context->Global()->Set(v8Context, m_ObjName, obj).FromJust();
       pObjDef->m_StaticObj.Reset(pIsolate, obj);
@@ skipping 97 matching lines @@
 
   if (nObjDefnID < 0 || nObjDefnID >= CFXJS_ObjDefinition::MaxID(pIsolate))
     return v8::Local<v8::Object>();
 
   CFXJS_ObjDefinition* pObjDef =
       CFXJS_ObjDefinition::ForID(pIsolate, nObjDefnID);
   v8::Local<v8::Object> obj;
   if (!pObjDef->GetInstanceTemplate()->NewInstance(context).ToLocal(&obj))
     return v8::Local<v8::Object>();
 
-  obj->SetAlignedPointerInInternalField(0, new CFXJS_PrivateData(nObjDefnID));
+  obj->SetAlignedPointerInInternalField(0, new CFXJS_PerObjectData(nObjDefnID));
   if (pObjDef->m_pConstructor)
     pObjDef->m_pConstructor(pIRuntime, obj);
 
   return obj;
 }
 
 v8::Local<v8::Object> FXJS_GetThisObj(v8::Isolate* pIsolate) {
   v8::Isolate::Scope isolate_scope(pIsolate);
   if (!FXJS_PerIsolateData::Get(pIsolate))
     return v8::Local<v8::Object>();
 
   // Return the global object.
   v8::Local<v8::Context> context = pIsolate->GetCurrentContext();
   return context->Global()->GetPrototype()->ToObject(context).ToLocalChecked();
 }
 
 int FXJS_GetObjDefnID(v8::Local<v8::Object> pObj) {
   if (pObj.IsEmpty() || !pObj->InternalFieldCount())
     return -1;
-  CFXJS_PrivateData* pPrivateData =
-      (CFXJS_PrivateData*)pObj->GetAlignedPointerFromInternalField(0);
-  if (pPrivateData)
-    return pPrivateData->ObjDefID;
+  CFXJS_PerObjectData* pPerObjectData = static_cast<CFXJS_PerObjectData*>(
+      pObj->GetAlignedPointerFromInternalField(0));
+  if (pPerObjectData)
+    return pPerObjectData->m_ObjDefID;
   return -1;
 }
 
 void FXJS_Error(v8::Isolate* pIsolate, const CFX_WideString& message) {
   // Conversion from pdfium's wchar_t wide-strings to v8's uint16_t
   // wide-strings isn't handled by v8, so use UTF8 as a common
   // intermediate format.
   CFX_ByteString utf8_message = message.UTF8Encode();
   pIsolate->ThrowException(
       v8::String::NewFromUtf8(pIsolate, utf8_message.c_str(),
@@ skipping 18 matching lines @@
   if (pObj->IsUndefined())
     return kFXJSValueNameUndefined;
   return NULL;
 }
 
 void FXJS_SetPrivate(v8::Isolate* pIsolate,
                      v8::Local<v8::Object> pObj,
                      void* p) {
   if (pObj.IsEmpty() || !pObj->InternalFieldCount())
     return;
-  CFXJS_PrivateData* pPrivateData =
-      (CFXJS_PrivateData*)pObj->GetAlignedPointerFromInternalField(0);
-  if (!pPrivateData)
+  CFXJS_PerObjectData* pPerObjectData = static_cast<CFXJS_PerObjectData*>(
+      pObj->GetAlignedPointerFromInternalField(0));
+  if (!pPerObjectData)
     return;
-  pPrivateData->pPrivate = p;
+  pPerObjectData->m_pPrivate = p;
 }
 
 void* FXJS_GetPrivate(v8::Isolate* pIsolate, v8::Local<v8::Object> pObj) {
   if (pObj.IsEmpty())
     return nullptr;
-  CFXJS_PrivateData* pPrivateData = nullptr;
+  CFXJS_PerObjectData* pPerObjectData = nullptr;
   if (pObj->InternalFieldCount()) {
-    pPrivateData =
-        (CFXJS_PrivateData*)pObj->GetAlignedPointerFromInternalField(0);
+    pPerObjectData = static_cast<CFXJS_PerObjectData*>(
+        pObj->GetAlignedPointerFromInternalField(0));
   } else {
     // It could be a global proxy object.
     v8::Local<v8::Value> v = pObj->GetPrototype();
     v8::Local<v8::Context> context = pIsolate->GetCurrentContext();
     if (v->IsObject()) {
-      pPrivateData = (CFXJS_PrivateData*)v->ToObject(context)
-                         .ToLocalChecked()
-                         ->GetAlignedPointerFromInternalField(0);
+      pPerObjectData = static_cast<CFXJS_PerObjectData*>(
+          v->ToObject(context)
+              .ToLocalChecked()
+              ->GetAlignedPointerFromInternalField(0));
     }
   }
-  return pPrivateData ? pPrivateData->pPrivate : nullptr;
+  return pPerObjectData ? pPerObjectData->m_pPrivate : nullptr;
 }
 
-void FXJS_FreePrivate(void* pPrivateData) {
-  delete (CFXJS_PrivateData*)pPrivateData;
+void FXJS_FreePrivate(void* pPerObjectData) {
+  delete static_cast<CFXJS_PerObjectData*>(pPerObjectData);
 }
 
 void FXJS_FreePrivate(v8::Local<v8::Object> pObj) {
   if (pObj.IsEmpty() || !pObj->InternalFieldCount())
     return;
   FXJS_FreePrivate(pObj->GetAlignedPointerFromInternalField(0));
   pObj->SetAlignedPointerInInternalField(0, NULL);
 }
 
 v8::Local<v8::String> FXJS_WSToJSString(v8::Isolate* pIsolate,
@@ skipping 224 matching lines @@
     return v8::Local<v8::Array>();
   v8::Local<v8::Context> context = pIsolate->GetCurrentContext();
   return v8::Local<v8::Array>::Cast(pValue->ToObject(context).ToLocalChecked());
 }
 
 void FXJS_ValueCopy(v8::Local<v8::Value>& pTo, v8::Local<v8::Value> pFrom) {
   pTo = pFrom;
 }