commit 06dd6504b534f109ac5c1fed2adad4e0455762a3
author Tom Sepez <tsepez@chromium.org> Mon Aug 15 23:11:55 2022 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Mon Aug 15 23:11:55 2022 +0000
tree 330c55da18672c90a0c57497c88b60f168b46533
parent fa7f590933d40883642cefe71a8b222babdaa6e5

Encapsulate CFXJS_PerObjectData public instance variables.

Bug: pdfium:1680
Change-Id: Ib859f7e3e07e8d8d1129adc95cb7d37c8f9cac76
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/96516
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>

fxjs/cfxjs_engine.cpp

diff --git a/fxjs/cfxjs_engine.cpp b/fxjs/cfxjs_engine.cpp
index ce15bf8..b4ce4e5 100644
--- a/fxjs/cfxjs_engine.cpp
+++ b/fxjs/cfxjs_engine.cpp
@@ -139,6 +139,11 @@
         pObj->GetAlignedPointerFromInternalField(1));
   }
 
+  uint32_t GetObjDefnID() const { return m_ObjDefnID; }
+  CJS_Object* GetPrivate() { return m_pPrivate.get(); }
+  void SetPrivate(std::unique_ptr<CJS_Object> p) { m_pPrivate = std::move(p); }
+
+ private:
   const uint32_t m_ObjDefnID;
   std::unique_ptr<CJS_Object> m_pPrivate;
 };
@@ -371,7 +376,7 @@
 // static
 uint32_t CFXJS_Engine::GetObjDefnID(v8::Local<v8::Object> pObj) {
   CFXJS_PerObjectData* pData = CFXJS_PerObjectData::GetFromObject(pObj);
-  return pData ? pData->m_ObjDefnID : 0;
+  return pData ? pData->GetObjDefnID() : 0;
 }
 
 // static
@@ -379,9 +384,8 @@
                                     std::unique_ptr<CJS_Object> p) {
   CFXJS_PerObjectData* pPerObjectData =
       CFXJS_PerObjectData::GetFromObject(pObj);
-  if (!pPerObjectData)
-    return;
-  pPerObjectData->m_pPrivate = std::move(p);
+  if (pPerObjectData)
+    pPerObjectData->SetPrivate(std::move(p));
 }
 
 // static
@@ -646,7 +650,7 @@
                                            v8::Local<v8::Object> pObj) {
   auto* pData = CFXJS_PerObjectData::GetFromObject(pObj);
   if (pData)
-    return pData->m_pPrivate.get();
+    return pData->GetPrivate();
 
   if (pObj.IsEmpty())
     return nullptr;
@@ -666,11 +670,11 @@
     return nullptr;
 
   CFXJS_ObjDefinition* pObjDef =
-      pIsolateData->ObjDefinitionForID(pProtoData->m_ObjDefnID);
+      pIsolateData->ObjDefinitionForID(pProtoData->GetObjDefnID());
   if (!pObjDef || pObjDef->m_ObjType != FXJSOBJTYPE_GLOBAL)
     return nullptr;
 
-  return pProtoData->m_pPrivate.get();
+  return pProtoData->GetPrivate();
 }
 
 v8::Local<v8::Array> CFXJS_Engine::GetConstArray(const WideString& name) {