diff options
| author | Tom Sepez <tsepez@chromium.org> | 2017-03-14 12:13:22 -0700 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-03-14 19:59:49 +0000 |
| commit | f8a943908a414836271a1b7d7e4a97635d941b7f (patch) | |
| tree | 7f900d57e21c72a67a0347e4f25d0784bdad7c83 /xfa/fxfa/parser/cxfa_layoutprocessor.h | |
| parent | 05df075154a832fcb476e1dfcfb865722d0ea898 (diff) | |
| download | pdfium-f8a943908a414836271a1b7d7e4a97635d941b7f.tar.xz | |
Replace CXFA_{Object,Node}Array with std::vector
These two ought to happen at the same time as they are
intertwined in spots. Remove blatant casts between the
two along the way.
Change-Id: I9ce5d2faadf1e38aba7cade316560d24a66d8669
Reviewed-on: https://pdfium-review.googlesource.com/2933
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa/fxfa/parser/cxfa_layoutprocessor.h')
| -rw-r--r-- | xfa/fxfa/parser/cxfa_layoutprocessor.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/xfa/fxfa/parser/cxfa_layoutprocessor.h b/xfa/fxfa/parser/cxfa_layoutprocessor.h index 5861bf7048..c6950052a9 100644 --- a/xfa/fxfa/parser/cxfa_layoutprocessor.h +++ b/xfa/fxfa/parser/cxfa_layoutprocessor.h @@ -8,6 +8,7 @@ #define XFA_FXFA_PARSER_CXFA_LAYOUTPROCESSOR_H_ #include <memory> +#include <vector> #include "core/fxcrt/fx_system.h" #include "xfa/fxfa/parser/xfa_object.h" @@ -33,7 +34,7 @@ class CXFA_LayoutProcessor { CXFA_ContainerLayoutItem* GetPage(int32_t index) const; CXFA_LayoutItem* GetLayoutItem(CXFA_Node* pFormItem); void AddChangedContainer(CXFA_Node* pContainer); - void SetForceReLayout(bool bForceRestart) { m_bNeeLayout = bForceRestart; } + void SetForceReLayout(bool bForceRestart) { m_bNeedLayout = bForceRestart; } CXFA_ContainerLayoutItem* GetRootLayoutItem() const; CXFA_ItemLayoutProcessor* GetRootRootItemLayoutProcessor() const { return m_pRootItemLayoutProcessor.get(); @@ -48,9 +49,9 @@ class CXFA_LayoutProcessor { CXFA_Document* const m_pDocument; std::unique_ptr<CXFA_ItemLayoutProcessor> m_pRootItemLayoutProcessor; std::unique_ptr<CXFA_LayoutPageMgr> m_pLayoutPageMgr; - CXFA_NodeArray m_rgChangedContainers; + std::vector<CXFA_Node*> m_rgChangedContainers; uint32_t m_nProgressCounter; - bool m_bNeeLayout; + bool m_bNeedLayout; }; #endif // XFA_FXFA_PARSER_CXFA_LAYOUTPROCESSOR_H_ |