XFA: merge patch from CL 831903002, m_sTimeMap fixes

fpdfsdk/include/javascript/JS_Object.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 _JS_OBJECT_H_
 #define _JS_OBJECT_H_
 
 class CJS_Object;
@@ skipping 139 matching lines @@
                                         return i;
                         }
                 }
 
                 return -1;
         }
 
         CTimerMapArray          m_Array;
 };
 
-static JS_TIMER_MAPARRAY        m_sTimeMap;
+JS_TIMER_MAPARRAY& GetTimeMap();
 
 class CJS_Runtime;
 
 class CJS_Timer
 {
 public:
         CJS_Timer(CJS_EmbedObj * pObj, CPDFDoc_Environment* pApp):
                 m_nTimerID(0), 
                 m_pEmbedObj(pObj), 
                 m_bProcessing(FALSE),
@@ skipping 10 matching lines @@
         {
                 KillJSTimer();
         }
 
 public:
         FX_UINT SetJSTimer(FX_UINT nElapse)
         {       
                 if (m_nTimerID)KillJSTimer();
                 IFX_SystemHandler* pHandler = m_pApp->GetSysHandler();
                 m_nTimerID = pHandler->SetTimer(nElapse,TimerProc);
-                m_sTimeMap.SetAt(m_nTimerID,this);
+                GetTimeMap().SetAt(m_nTimerID,this);
                 m_dwElapse = nElapse;
                 return m_nTimerID;
         };
 
         void KillJSTimer()
         {
                 if (m_nTimerID)
                 {
                         if (m_pApp == NULL) {
                                 m_sTimeMap.RemoveAt(m_nTimerID);

[Bo Xu, 2015/01/05 22:05:39]

This one is not fixed?

[brucedawson, 2015/01/05 22:18:20]

Good catch. I guess I'm merging over without enough double-checking. Fixing.

                                 m_nTimerID = 0;
                                 return;
                         }
                         IFX_SystemHandler* pHandler = m_pApp->GetSysHandler();
                         pHandler->KillTimer(m_nTimerID);
-                        m_sTimeMap.RemoveAt(m_nTimerID);
+                        GetTimeMap().RemoveAt(m_nTimerID);
                         m_nTimerID = 0;
                 }
         };
 
         void SetType(int nType)
         {
                 m_nType = nType;
         }
 
         int GetType() const
@@ skipping 36 matching lines @@
                 m_swJScript = script;
         }
 
         CFX_WideString GetJScript() const
         {
                 return m_swJScript;
         }
 
         static void TimerProc(int idEvent)
         {
-                if (CJS_Timer * pTimer = m_sTimeMap.GetAt(idEvent))
+                if (CJS_Timer * pTimer = GetTimeMap().GetAt(idEvent))
                 {
                         if (!pTimer->m_bProcessing)
                         {
                                 pTimer->m_bProcessing = TRUE;
                                 if (pTimer->m_pEmbedObj) pTimer->m_pEmbedObj->TimerProc(pTimer);
                                 pTimer->m_bProcessing = FALSE;
                         }
                         else
                         {
                         //      TRACE(L"BUSY!\n");
@@ skipping 10 matching lines @@
         FX_DWORD                                                m_dwStartTime;
         FX_DWORD                                                m_dwTimeOut;
         FX_DWORD                                                m_dwElapse;
         CJS_Runtime*                                    m_pRuntime;
         CFX_WideString                                  m_swJScript;
         int                                                             m_nType; //0:Interval; 1:TimeOut
 
         CPDFDoc_Environment*                    m_pApp;
 };
 #endif //_JS_OBJECT_H_