diff options
author | Dan Sinclair <dsinclair@chromium.org> | 2018-01-31 20:23:37 +0000 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2018-01-31 20:23:37 +0000 |
commit | 11d33e18661c9492dda7ba9cf9fe33e38637858a (patch) | |
tree | acb395be0a1771318789eb547b600eb17da1f640 /xfa/fxfa/parser/cxfa_itemlayoutprocessor.h | |
parent | a975a83691dbfdf34754c7705dcc715bc5c73820 (diff) | |
download | pdfium-11d33e18661c9492dda7ba9cf9fe33e38637858a.tar.xz |
Move initializers to header for CXFA_ItemLayoutProcess
This CL moves the static construction values from the cpp to the h file.
Change-Id: I04ff6513be2287582b90453390e5bd44c5b47d68
Reviewed-on: https://pdfium-review.googlesource.com/24870
Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa/fxfa/parser/cxfa_itemlayoutprocessor.h')
-rw-r--r-- | xfa/fxfa/parser/cxfa_itemlayoutprocessor.h | 36 |
1 files changed, 19 insertions, 17 deletions
diff --git a/xfa/fxfa/parser/cxfa_itemlayoutprocessor.h b/xfa/fxfa/parser/cxfa_itemlayoutprocessor.h index fdca14285f..12709bad01 100644 --- a/xfa/fxfa/parser/cxfa_itemlayoutprocessor.h +++ b/xfa/fxfa/parser/cxfa_itemlayoutprocessor.h @@ -164,28 +164,30 @@ class CXFA_ItemLayoutProcessor { bool bNewRow); CXFA_Node* m_pFormNode; - CXFA_ContentLayoutItem* m_pLayoutItem; - CXFA_Node* m_pCurChildNode; - float m_fUsedSize; + CXFA_ContentLayoutItem* m_pLayoutItem = nullptr; + CXFA_Node* m_pCurChildNode = XFA_LAYOUT_INVALIDNODE; + float m_fUsedSize = 0; CXFA_LayoutPageMgr* m_pPageMgr; std::list<CXFA_Node*> m_PendingNodes; - bool m_bBreakPending; + bool m_bBreakPending = true; std::vector<float> m_rgSpecifiedColumnWidths; std::vector<CXFA_ContentLayoutItem*> m_arrayKeepItems; - float m_fLastRowWidth; - float m_fLastRowY; - bool m_bUseInheriated; - XFA_ItemLayoutProcessorResult m_ePreProcessRs; - bool m_bKeepBreakFinish; - bool m_bIsProcessKeep; - CXFA_Node* m_pKeepHeadNode; - CXFA_Node* m_pKeepTailNode; - CXFA_ContentLayoutItem* m_pOldLayoutItem; - CXFA_ItemLayoutProcessor* m_pCurChildPreprocessor; - XFA_ItemLayoutProcessorStages m_nCurChildNodeStage; + float m_fLastRowWidth = 0; + float m_fLastRowY = 0; + bool m_bUseInheriated = false; + XFA_ItemLayoutProcessorResult m_ePreProcessRs = + XFA_ItemLayoutProcessorResult::Done; + bool m_bKeepBreakFinish = false; + bool m_bIsProcessKeep = false; + CXFA_Node* m_pKeepHeadNode = nullptr; + CXFA_Node* m_pKeepTailNode = nullptr; + CXFA_ContentLayoutItem* m_pOldLayoutItem = nullptr; + CXFA_ItemLayoutProcessor* m_pCurChildPreprocessor = nullptr; + XFA_ItemLayoutProcessorStages m_nCurChildNodeStage = + XFA_ItemLayoutProcessorStages::None; std::map<CXFA_Node*, int32_t> m_PendingNodesCount; - float m_fWidthLimite; - bool m_bHasAvailHeight; + float m_fWidthLimite = 0; + bool m_bHasAvailHeight = true; }; #endif // XFA_FXFA_PARSER_CXFA_ITEMLAYOUTPROCESSOR_H_ |