Next round of XFA changes to match master

fpdfsdk/src/javascript/JS_GlobalData.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 "JS_GlobalData.h"
 
 #include "../../../core/include/fdrm/fx_crypt.h"
 #include "../../include/javascript/IJavaScript.h"
@@ skipping 99 matching lines @@
   return g_Instance;
 }
 
 void CJS_GlobalData::Release() {
   if (!--m_RefCount) {
     delete g_Instance;
     g_Instance = nullptr;
   }
 }
 
-CJS_GlobalData::CJS_GlobalData(CPDFDoc_Environment* pApp)
-    : m_pApp(pApp), m_RefCount(0) {
+CJS_GlobalData::CJS_GlobalData(CPDFDoc_Environment* pApp) : m_RefCount(0) {

[Lei Zhang, 2015/10/14 21:02:27]

Why bother even passing in |pApp| then?

   m_sFilePath += SDK_JS_GLOBALDATA_FILENAME;
   LoadGlobalPersistentVariables();
 }
 
 CJS_GlobalData::~CJS_GlobalData() {
   SaveGlobalPersisitentVariables();
   for (int i = 0, sz = m_arrayGlobalData.GetSize(); i < sz; i++)
     delete m_arrayGlobalData.GetAt(i);
 
   m_arrayGlobalData.RemoveAll();
@@ skipping 358 matching lines @@
     case JS_GLOBALDATA_TYPE_NULL: {
       FX_DWORD dwNameLen = (FX_DWORD)name.GetLength();
       sData.AppendBlock(&dwNameLen, sizeof(FX_DWORD));
       sData.AppendString(name);
       sData.AppendBlock(&wType, sizeof(FX_DWORD));
     } break;
     default:
       break;
   }
 }