From 0c53b008b4f2f7a790f756d706a00e8de98dfedd Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Mon, 8 Jan 2018 14:30:00 -0500 Subject: Change the FFWidgets to store the node This CL changes the various CXFA_FF* widgets to hold a CXFA_Node instead of a CXFA_WidgetAcc wrapper. Change-Id: I7e31633d5ffd3b61abcdcdfeee7822514c5b28da Reviewed-on: https://pdfium-review.googlesource.com/22410 Reviewed-by: Ryan Harrison Commit-Queue: dsinclair --- xfa/fxfa/cxfa_ffwidget.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'xfa/fxfa/cxfa_ffwidget.h') diff --git a/xfa/fxfa/cxfa_ffwidget.h b/xfa/fxfa/cxfa_ffwidget.h index f52098301f..5857800ba9 100644 --- a/xfa/fxfa/cxfa_ffwidget.h +++ b/xfa/fxfa/cxfa_ffwidget.h @@ -78,13 +78,13 @@ class CXFA_CalcData { CXFA_CalcData(); ~CXFA_CalcData(); - std::vector m_Globals; + std::vector m_Globals; int32_t m_iRefCount; }; class CXFA_FFWidget : public CXFA_ContentLayoutItem { public: - explicit CXFA_FFWidget(CXFA_WidgetAcc* pDataAcc); + explicit CXFA_FFWidget(CXFA_Node* pNode); ~CXFA_FFWidget() override; virtual CFX_RectF GetBBox(uint32_t dwStatus, bool bDrawFocus = false); @@ -146,7 +146,7 @@ class CXFA_FFWidget : public CXFA_ContentLayoutItem { uint32_t GetStatus(); void ModifyStatus(uint32_t dwAdded, uint32_t dwRemoved); - CXFA_WidgetAcc* GetDataAcc(); + CXFA_Node* GetNode() { return m_pNode.Get(); } CXFA_FFDocView* GetDocView(); void SetDocView(CXFA_FFDocView* pDocView); @@ -181,9 +181,9 @@ class CXFA_FFWidget : public CXFA_ContentLayoutItem { bool IsButtonDown(); void SetButtonDown(bool bSet); - CXFA_FFDocView* m_pDocView; - CXFA_FFPageView* m_pPageView; - UnownedPtr const m_pDataAcc; + CXFA_FFDocView* m_pDocView = nullptr; + CXFA_FFPageView* m_pPageView = nullptr; + UnownedPtr const m_pNode; mutable CFX_RectF m_rtWidget; }; -- cgit v1.2.3