Next round of XFA changes to match master

fpdfsdk/src/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_SRC_JAVASCRIPT_JS_GLOBALDATA_H_
 #define FPDFSDK_SRC_JAVASCRIPT_JS_GLOBALDATA_H_
 
 #include "../../../core/include/fxcrt/fx_basic.h"
@@ skipping 61 matching lines @@
   FX_BOOL SetGlobalVariablePersistent(const FX_CHAR* propname,
                                       FX_BOOL bPersistent);
   FX_BOOL DeleteGlobalVariable(const FX_CHAR* propname);
 
   int32_t GetSize() const;
   CJS_GlobalData_Element* GetAt(int index) const;
 
  private:
   static CJS_GlobalData* g_Instance;
 
-  CJS_GlobalData(CPDFDoc_Environment* pApp);
+  CJS_GlobalData();
   ~CJS_GlobalData();
 
   void LoadGlobalPersistentVariables();
   void SaveGlobalPersisitentVariables();
 
   CJS_GlobalData_Element* GetGlobalVariable(const FX_CHAR* propname);
   int FindGlobalVariable(const FX_CHAR* propname);
 
   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);
 
- private:
   size_t m_RefCount;
   CFX_ArrayTemplate<CJS_GlobalData_Element*> m_arrayGlobalData;
   CFX_WideString m_sFilePath;
-  CPDFDoc_Environment* m_pApp;
 };
 
 #endif  // FPDFSDK_SRC_JAVASCRIPT_JS_GLOBALDATA_H_