diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2018-01-08 14:30:00 -0500 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-01-08 20:03:36 +0000 |
| commit | 0c53b008b4f2f7a790f756d706a00e8de98dfedd (patch) | |
| tree | 7e8a3e6c22792f8ee4e79c85a808ce6ea346dac1 /xfa/fxfa/cxfa_ffwidget.h | |
| parent | 2f265dbf12831dece93a6a932fd99e5737cd1afd (diff) | |
| download | pdfium-0c53b008b4f2f7a790f756d706a00e8de98dfedd.tar.xz | |
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 <rharrison@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa/fxfa/cxfa_ffwidget.h')
| -rw-r--r-- | xfa/fxfa/cxfa_ffwidget.h | 12 |
1 files changed, 6 insertions, 6 deletions
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<CXFA_WidgetAcc*> m_Globals; + std::vector<CXFA_Node*> 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<CXFA_WidgetAcc> const m_pDataAcc; + CXFA_FFDocView* m_pDocView = nullptr; + CXFA_FFPageView* m_pPageView = nullptr; + UnownedPtr<CXFA_Node> const m_pNode; mutable CFX_RectF m_rtWidget; }; |