Clean up singleton implementation

fpdfsdk/javascript/JS_GlobalData.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
 
 #ifndef FPDFSDK_JAVASCRIPT_JS_GLOBALDATA_H_
 #define FPDFSDK_JAVASCRIPT_JS_GLOBALDATA_H_
 
 #include <memory>
 #include <vector>
 
 #include "core/fxcrt/include/fx_basic.h"
+#include "fpdfsdk/javascript/JS_KeyValue.h"
 
-#define JS_GLOBALDATA_TYPE_NUMBER 0
-#define JS_GLOBALDATA_TYPE_BOOLEAN 1
-#define JS_GLOBALDATA_TYPE_STRING 2
-#define JS_GLOBALDATA_TYPE_OBJECT 3
-#define JS_GLOBALDATA_TYPE_NULL 4
-
-class CJS_KeyValue;
 class CPDFDoc_Environment;
 
-class CJS_GlobalVariableArray {
- public:
-  CJS_GlobalVariableArray();
-  virtual ~CJS_GlobalVariableArray();
-
-  void Add(CJS_KeyValue* p);
-  int Count() const;
-  CJS_KeyValue* GetAt(int index) const;
-  void Copy(const CJS_GlobalVariableArray& array);
-
-  void Empty();
-
- private:
-  CFX_ArrayTemplate<CJS_KeyValue*> m_Array;
-};
-
-class CJS_KeyValue {
- public:
-  CJS_KeyValue();
-  virtual ~CJS_KeyValue();
-
-  CFX_ByteString sKey;
-  int nType;  // 0:int 1:bool 2:string 3:obj
-  double dData;
-  bool bData;
-  CFX_ByteString sData;
-  CJS_GlobalVariableArray objData;
-};
-
 class CJS_GlobalData_Element {
  public:
   CJS_GlobalData_Element() {}
-  virtual ~CJS_GlobalData_Element() {}
+  ~CJS_GlobalData_Element() {}
 
   CJS_KeyValue data;
   FX_BOOL bPersistent;
 };
 
 class CJS_GlobalData {
  public:
   static CJS_GlobalData* GetRetainedInstance(CPDFDoc_Environment* pApp);
   void Release();
 
@@ skipping 10 matching lines @@
 
   int32_t GetSize() const;
   CJS_GlobalData_Element* GetAt(int index) const;
 
  private:
   using iterator =
       std::vector<std::unique_ptr<CJS_GlobalData_Element>>::iterator;
   using const_iterator =
       std::vector<std::unique_ptr<CJS_GlobalData_Element>>::const_iterator;
 
-  static CJS_GlobalData* g_Instance;
-
   CJS_GlobalData();
   ~CJS_GlobalData();
 
   void LoadGlobalPersistentVariables();
   void SaveGlobalPersisitentVariables();
 
   CJS_GlobalData_Element* GetGlobalVariable(const CFX_ByteString& sPropname);
   iterator FindGlobalVariable(const CFX_ByteString& sPropname);
   const_iterator FindGlobalVariable(const CFX_ByteString& sPropname) const;
 
   void LoadFileBuffer(const FX_WCHAR* sFilePath,
                       uint8_t*& pBuffer,
                       int32_t& nLength);
   void WriteFileBuffer(const FX_WCHAR* sFilePath,
                        const FX_CHAR* pBuffer,
                        int32_t nLength);
   void MakeByteString(const CFX_ByteString& name,
                       CJS_KeyValue* pData,
                       CFX_BinaryBuf& sData);
 
   size_t m_RefCount;
   std::vector<std::unique_ptr<CJS_GlobalData_Element>> m_arrayGlobalData;
   CFX_WideString m_sFilePath;
 };
 
 #endif  // FPDFSDK_JAVASCRIPT_JS_GLOBALDATA_H_