| Index: xfa/src/fxfa/src/parser/xfa_layout_itemlayout.h
|
| diff --git a/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.h b/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.h
|
| index f53b19fe262089f2d72548b86b3d18189b945c9a..9ef40935a0873e08444b6d0489dda3d370cdb076 100644
|
| --- a/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.h
|
| +++ b/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.h
|
| @@ -7,20 +7,27 @@
|
| #ifndef XFA_SRC_FXFA_SRC_PARSER_XFA_LAYOUT_ITEMLAYOUT_H_
|
| #define XFA_SRC_FXFA_SRC_PARSER_XFA_LAYOUT_ITEMLAYOUT_H_
|
|
|
| +#include "float.h"
|
| +
|
| +#include <list>
|
| +
|
| #define XFA_LAYOUT_INVALIDNODE ((CXFA_Node*)(intptr_t)-1)
|
| #define XFA_LAYOUT_FLOAT_PERCISION (0.0005f)
|
| -#include "float.h"
|
| #define XFA_LAYOUT_FLOAT_MAX FLT_MAX
|
| -class CXFA_ItemLayoutProcessor;
|
| -class CXFA_LayoutPageMgr;
|
| +
|
| class CXFA_ContainerLayoutItem;
|
| class CXFA_ContentLayoutItem;
|
| +class CXFA_ItemLayoutProcessor;
|
| +class CXFA_LayoutPageMgr;
|
| +class CXFA_Node;
|
| +
|
| enum XFA_ItemLayoutProcessorResult {
|
| XFA_ItemLayoutProcessorResult_Done,
|
| XFA_ItemLayoutProcessorResult_PageFullBreak,
|
| XFA_ItemLayoutProcessorResult_RowFullBreak,
|
| XFA_ItemLayoutProcessorResult_ManualBreak,
|
| };
|
| +
|
| enum XFA_ItemLayoutProcessorStages {
|
| XFA_ItemLayoutProcessorStages_None,
|
| XFA_ItemLayoutProcessorStages_BookendLeader,
|
| @@ -171,7 +178,7 @@ class CXFA_ItemLayoutProcessor {
|
| XFA_ItemLayoutProcessorStages m_nCurChildNodeStage;
|
| FX_FLOAT m_fUsedSize;
|
| CXFA_LayoutPageMgr* m_pPageMgr;
|
| - CFX_PtrList m_rgPendingNodes;
|
| + std::list<CXFA_Node*> m_PendingNodes;
|
| FX_BOOL m_bBreakPending;
|
| CFX_ArrayTemplate<FX_FLOAT> m_rgSpecifiedColumnWidths;
|
| CFX_ArrayTemplate<CXFA_ContentLayoutItem*> m_arrayKeepItems;
|
|
|