From f9d49da715deeb0efa6eaaf8ac43727ae28f8749 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Mon, 16 Jul 2018 21:52:56 +0000 Subject: Use UnownedPtr/Optional in cfxa_layoutcontext.cpp Introduce cfxa_layoutcontext.cpp to satisfy chromium style ctor check. Fix typo in class forward declaration in cfxa_layoutcontext.h Change-Id: I2b29bf61a21be0f895faf8984897c5655a4f0e89 Reviewed-on: https://pdfium-review.googlesource.com/37950 Commit-Queue: Tom Sepez Reviewed-by: Lei Zhang --- xfa/fxfa/parser/cxfa_layoutcontext.h | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) (limited to 'xfa/fxfa/parser/cxfa_layoutcontext.h') diff --git a/xfa/fxfa/parser/cxfa_layoutcontext.h b/xfa/fxfa/parser/cxfa_layoutcontext.h index a133ee19d9..9927d3e534 100644 --- a/xfa/fxfa/parser/cxfa_layoutcontext.h +++ b/xfa/fxfa/parser/cxfa_layoutcontext.h @@ -9,24 +9,21 @@ #include -class CXFA_ItemLayoutProcess; +#include "core/fxcrt/unowned_ptr.h" +#include "third_party/base/optional.h" + +class CXFA_ItemLayoutProcessor; class CXFA_Node; class CXFA_LayoutContext { public: - CXFA_LayoutContext() - : m_prgSpecifiedColumnWidths(nullptr), - m_fCurColumnWidth(0), - m_bCurColumnWidthAvaiable(false), - m_pOverflowProcessor(nullptr), - m_pOverflowNode(nullptr) {} - ~CXFA_LayoutContext() {} - - std::vector* m_prgSpecifiedColumnWidths; - float m_fCurColumnWidth; - bool m_bCurColumnWidthAvaiable; - CXFA_ItemLayoutProcessor* m_pOverflowProcessor; - CXFA_Node* m_pOverflowNode; + CXFA_LayoutContext(); + ~CXFA_LayoutContext(); + + Optional m_fCurColumnWidth; + UnownedPtr> m_prgSpecifiedColumnWidths; + UnownedPtr m_pOverflowProcessor; + UnownedPtr m_pOverflowNode; }; #endif // XFA_FXFA_PARSER_CXFA_LAYOUTCONTEXT_H_ -- cgit v1.2.3