Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(246)

Unified Diff: fpdfsdk/include/javascript/JS_Object.h

Issue 800883004: XFA: merge patch from CL 831903002, m_sTimeMap fixes (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@xfa
Patch Set: Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | fpdfsdk/src/javascript/JS_Object.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: fpdfsdk/include/javascript/JS_Object.h
diff --git a/fpdfsdk/include/javascript/JS_Object.h b/fpdfsdk/include/javascript/JS_Object.h
index ca6f4a1d114e605bec785d9392445a8096753e65..7bdfcf1a530c4085af44c2f1a000e140cec1f28f 100644
--- a/fpdfsdk/include/javascript/JS_Object.h
+++ b/fpdfsdk/include/javascript/JS_Object.h
@@ -157,7 +157,7 @@ public:
CTimerMapArray m_Array;
};
-static JS_TIMER_MAPARRAY m_sTimeMap;
+JS_TIMER_MAPARRAY& GetTimeMap();
class CJS_Runtime;
@@ -188,7 +188,7 @@ public:
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;
};
@@ -204,7 +204,7 @@ public:
}
IFX_SystemHandler* pHandler = m_pApp->GetSysHandler();
pHandler->KillTimer(m_nTimerID);
- m_sTimeMap.RemoveAt(m_nTimerID);
+ GetTimeMap().RemoveAt(m_nTimerID);
m_nTimerID = 0;
}
};
@@ -261,7 +261,7 @@ public:
static void TimerProc(int idEvent)
{
- if (CJS_Timer * pTimer = m_sTimeMap.GetAt(idEvent))
+ if (CJS_Timer * pTimer = GetTimeMap().GetAt(idEvent))
{
if (!pTimer->m_bProcessing)
{
« no previous file with comments | « no previous file | fpdfsdk/src/javascript/JS_Object.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698