XFA: merge patch from CL 832703003, remove g_timeMap global
authorBruce Dawson <brucedawson@google.com>
Mon, 5 Jan 2015 23:31:49 +0000 (15:31 -0800)
committerBruce Dawson <brucedawson@google.com>
Mon, 5 Jan 2015 23:31:49 +0000 (15:31 -0800)
Get rid of g_timeMap global object.

g_timeMap is a global variable with a constructor and destructor so it
must be removed.

BUG=441899
TBR=tsepez@chromium.org

Review URL: https://codereview.chromium.org/832703003

Review URL: https://codereview.chromium.org/837483006

fpdfsdk/src/pdfwindow/PWL_Wnd.cpp

index bc33487..69535d7 100644 (file)
 
 /* -------------------------- CPWL_Timer -------------------------- */
 
-static CFX_MapPtrTemplate<FX_INT32, CPWL_Timer*>       g_TimeMap;
+static CFX_MapPtrTemplate<FX_INT32, CPWL_Timer*>& GetPWLTimeMap()
+{
+  // Leak the object at shutdown.
+  static auto timeMap = new CFX_MapPtrTemplate<FX_INT32, CPWL_Timer*>;
+  return *timeMap;
+}
 
 CPWL_Timer::CPWL_Timer(CPWL_TimerHandler* pAttached, IFX_SystemHandler* pSystemHandler) : 
        m_nTimerID(0),
@@ -31,7 +36,7 @@ FX_INT32 CPWL_Timer::SetPWLTimer(FX_INT32 nElapse)
 {      
        if (m_nTimerID != 0) KillPWLTimer();
        m_nTimerID = m_pSystemHandler->SetTimer(nElapse, TimerProc);
-       g_TimeMap.SetAt(m_nTimerID, this);
+       GetPWLTimeMap().SetAt(m_nTimerID, this);
        return m_nTimerID;
 }
 
@@ -40,7 +45,7 @@ void CPWL_Timer::KillPWLTimer()
        if (m_nTimerID != 0)
        {
                m_pSystemHandler->KillTimer(m_nTimerID);
-               g_TimeMap.RemoveKey(m_nTimerID);
+               GetPWLTimeMap().RemoveKey(m_nTimerID);
                m_nTimerID = 0;
        }
 }
@@ -48,7 +53,7 @@ void CPWL_Timer::KillPWLTimer()
 void CPWL_Timer::TimerProc(FX_INT32 idEvent)
 {
        CPWL_Timer* pTimer = NULL;
-       if (g_TimeMap.Lookup(idEvent, pTimer))
+       if (GetPWLTimeMap().Lookup(idEvent, pTimer))
        {
                if (pTimer)
                {