summaryrefslogtreecommitdiff
path: root/fpdfsdk/include/fpdfxfa
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2016-02-04 13:13:05 -0800
committerTom Sepez <tsepez@chromium.org>2016-02-04 13:13:05 -0800
commitf6488cdb6633cd4b32fe08fb124f19c20b3afb59 (patch)
treee5eff7d9fdc9d43c0ce90a16db6d5b6849715a0f /fpdfsdk/include/fpdfxfa
parentcdac3446f26751ff5db4123d87710f8b4e15d11c (diff)
downloadpdfium-f6488cdb6633cd4b32fe08fb124f19c20b3afb59.tar.xz
Kill CFX_PtryArray in CXFA_FWLAdapterTimerMgr.
R=thestig@chromium.org Review URL: https://codereview.chromium.org/1664543005 .
Diffstat (limited to 'fpdfsdk/include/fpdfxfa')
-rw-r--r--fpdfsdk/include/fpdfxfa/fpdfxfa_util.h11
1 files changed, 9 insertions, 2 deletions
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 <vector>
+
#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<CFWL_TimerInfo*> 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;
};