diff options
| author | Tom Sepez <tsepez@chromium.org> | 2016-01-20 14:59:25 -0800 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2016-01-20 14:59:25 -0800 |
| commit | 6c7508bf13e39e21f39d98fc1a6a6ad8aefb96c1 (patch) | |
| tree | 5bc1c888da9ae95913b350ee2904da7bf5a23b90 /fpdfsdk/include | |
| parent | fcb6398ea511e32a09d192543f70041b82646df1 (diff) | |
| download | pdfium-6c7508bf13e39e21f39d98fc1a6a6ad8aefb96c1.tar.xz | |
Merge to XFA: Use std::set to track visited dictionaries in fsdk_actionhandler.
Original Review URL: https://codereview.chromium.org/1610303002 .
(cherry picked from commit f409da4b8a3e6a3885605a47bed4f8798c4703b9)
TBR=ochang@chromium.org
Review URL: https://codereview.chromium.org/1611733002 .
Diffstat (limited to 'fpdfsdk/include')
| -rw-r--r-- | fpdfsdk/include/fsdk_actionhandler.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/fpdfsdk/include/fsdk_actionhandler.h b/fpdfsdk/include/fsdk_actionhandler.h index 33f127d8c9..b5672d178d 100644 --- a/fpdfsdk/include/fsdk_actionhandler.h +++ b/fpdfsdk/include/fsdk_actionhandler.h @@ -8,12 +8,12 @@ #define FPDFSDK_INCLUDE_FSDK_ACTIONHANDLER_H_ #include <memory> +#include <set> #include "core/include/fpdfdoc/fpdf_doc.h" #include "core/include/fxcrt/fx_string.h" #include "fsdk_baseform.h" -class CFX_PtrList; class CPDFSDK_Annot; class CPDFSDK_Document; class CPDF_Bookmark; @@ -68,29 +68,29 @@ class CPDFSDK_ActionHandler { private: FX_BOOL ExecuteDocumentOpenAction(const CPDF_Action& action, CPDFSDK_Document* pDocument, - CFX_PtrList& list); + std::set<CPDF_Dictionary*>* visited); FX_BOOL ExecuteDocumentPageAction(const CPDF_Action& action, CPDF_AAction::AActionType type, CPDFSDK_Document* pDocument, - CFX_PtrList& list); + std::set<CPDF_Dictionary*>* visited); FX_BOOL ExecuteFieldAction(const CPDF_Action& action, CPDF_AAction::AActionType type, CPDFSDK_Document* pDocument, CPDF_FormField* pFormField, PDFSDK_FieldAction& data, - CFX_PtrList& list); + std::set<CPDF_Dictionary*>* visited); FX_BOOL ExecuteScreenAction(const CPDF_Action& action, CPDF_AAction::AActionType type, CPDFSDK_Document* pDocument, CPDFSDK_Annot* pScreen, - CFX_PtrList& list); + std::set<CPDF_Dictionary*>* visited); FX_BOOL ExecuteBookMark(const CPDF_Action& action, CPDFSDK_Document* pDocument, CPDF_Bookmark* pBookmark, - CFX_PtrList& list); + std::set<CPDF_Dictionary*>* visited); FX_BOOL ExecuteLinkAction(const CPDF_Action& action, CPDFSDK_Document* pDocument, - CFX_PtrList& list); + std::set<CPDF_Dictionary*>* visited); void DoAction_NoJs(const CPDF_Action& action, CPDFSDK_Document* pDocument); void RunDocumentPageJavaScript(CPDFSDK_Document* pDocument, |