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

Unified Diff: fpdfsdk/include/fpdfxfa/fpdfxfa_util.h

Issue 1664543005: Kill CFX_PtryArray in CXFA_FWLAdapterTimerMgr. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@xfa
Patch Set: Stale iterator. Created 4 years, 10 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/fpdfxfa/fpdfxfa_util.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: fpdfsdk/include/fpdfxfa/fpdfxfa_util.h
diff --git a/fpdfsdk/include/fpdfxfa/fpdfxfa_util.h b/fpdfsdk/include/fpdfxfa/fpdfxfa_util.h
index ca675bf27a0f912d0587f7d9a09b3b8736df5870..6cb07915ede0ccfe23bbacf7e89f095e0d8cc346 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;
};
« no previous file with comments | « no previous file | fpdfsdk/src/fpdfxfa/fpdfxfa_util.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698