From f6488cdb6633cd4b32fe08fb124f19c20b3afb59 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Thu, 4 Feb 2016 13:13:05 -0800 Subject: Kill CFX_PtryArray in CXFA_FWLAdapterTimerMgr. R=thestig@chromium.org Review URL: https://codereview.chromium.org/1664543005 . --- fpdfsdk/include/fpdfxfa/fpdfxfa_util.h | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'fpdfsdk/include/fpdfxfa/fpdfxfa_util.h') diff --git a/fpdfsdk/include/fpdfxfa/fpdfxfa_util.h b/fpdfsdk/include/fpdfxfa/fpdfxfa_util.h index ca675bf27a..6cb07915ed 100644 --- a/fpdfsdk/include/fpdfxfa/fpdfxfa_util.h +++ b/fpdfsdk/include/fpdfxfa/fpdfxfa_util.h @@ -7,6 +7,8 @@ #ifndef FPDFSDK_INCLUDE_FPDFXFA_FPDFXFA_UTIL_H_ #define FPDFSDK_INCLUDE_FPDFXFA_FPDFXFA_UTIL_H_ +#include + #include "xfa/include/fwl/adapter/fwl_adaptertimermgr.h" #define JS_STR_VIEWERTYPE_STANDARD L"Exchange" @@ -14,6 +16,8 @@ #define JS_STR_VIEWERVARIATION L"Full" #define JS_STR_VIEWERVERSION_XFA L"11" +class CFWL_TimerInfo; + class CXFA_FWLAdapterTimerMgr : public IFWL_AdapterTimerMgr { public: CXFA_FWLAdapterTimerMgr(CPDFDoc_Environment* pEnv) : m_pEnv(pEnv) {} @@ -26,13 +30,16 @@ class CXFA_FWLAdapterTimerMgr : public IFWL_AdapterTimerMgr { protected: static void TimerProc(int32_t idEvent); - static CFX_PtrArray ms_timerArray; - CPDFDoc_Environment* m_pEnv; + static std::vector s_TimerArray; + CPDFDoc_Environment* const m_pEnv; }; class CFWL_TimerInfo { public: CFWL_TimerInfo() : pTimer(nullptr) {} + CFWL_TimerInfo(uint32_t event, IFWL_Timer* timer) + : uIDEvent(event), pTimer(timer) {} + uint32_t uIDEvent; IFWL_Timer* pTimer; }; -- cgit v1.2.3