diff options
| author | Tom Sepez <tsepez@chromium.org> | 2018-06-29 16:19:59 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-06-29 16:19:59 +0000 |
| commit | ae82b696f236bc5bd1375532bcf867fcc6aa9126 (patch) | |
| tree | ec984dc11139bd57af09b7231c7777c233f77f63 | |
| parent | 611da5146966980bca581e37fd85afbc2f6c763e (diff) | |
| download | pdfium-ae82b696f236bc5bd1375532bcf867fcc6aa9126.tar.xz | |
Use more UnownedPtr<> in cxfa_ffwidget
Change-Id: Iae962711f522ad52e77f19201d00d9ab86096ca4
Reviewed-on: https://pdfium-review.googlesource.com/36510
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
| -rw-r--r-- | xfa/fxfa/cxfa_ffwidget.cpp | 10 | ||||
| -rw-r--r-- | xfa/fxfa/cxfa_ffwidget.h | 11 |
2 files changed, 7 insertions, 14 deletions
diff --git a/xfa/fxfa/cxfa_ffwidget.cpp b/xfa/fxfa/cxfa_ffwidget.cpp index a81063b335..05330a9a51 100644 --- a/xfa/fxfa/cxfa_ffwidget.cpp +++ b/xfa/fxfa/cxfa_ffwidget.cpp @@ -349,7 +349,7 @@ void CXFA_FFWidget::DrawBorderWithFlag(CXFA_Graphics* pGS, void CXFA_FFWidget::InvalidateRect() { CFX_RectF rtWidget = GetBBox(XFA_WidgetStatus_Focused); rtWidget.Inflate(2, 2); - m_pDocView->InvalidateRect(m_pPageView, rtWidget); + m_pDocView->InvalidateRect(m_pPageView.Get(), rtWidget); } bool CXFA_FFWidget::OnMouseEnter() { @@ -583,14 +583,6 @@ bool CXFA_FFWidget::PtInActiveRect(const CFX_PointF& point) { return GetWidgetRect().Contains(point); } -CXFA_FFDocView* CXFA_FFWidget::GetDocView() { - return m_pDocView; -} - -void CXFA_FFWidget::SetDocView(CXFA_FFDocView* pDocView) { - m_pDocView = pDocView; -} - CXFA_FFDoc* CXFA_FFWidget::GetDoc() { return m_pDocView->GetDoc(); } diff --git a/xfa/fxfa/cxfa_ffwidget.h b/xfa/fxfa/cxfa_ffwidget.h index f8d97dc551..283c8cbbc7 100644 --- a/xfa/fxfa/cxfa_ffwidget.h +++ b/xfa/fxfa/cxfa_ffwidget.h @@ -140,8 +140,11 @@ class CXFA_FFWidget : public CXFA_ContentLayoutItem { virtual FormFieldType GetFormFieldType(); - CXFA_FFPageView* GetPageView() const { return m_pPageView; } + CXFA_FFPageView* GetPageView() const { return m_pPageView.Get(); } void SetPageView(CXFA_FFPageView* pPageView) { m_pPageView = pPageView; } + CXFA_FFDocView* GetDocView() const { return m_pDocView.Get(); } + void SetDocView(CXFA_FFDocView* pDocView) { m_pDocView = pDocView; } + const CFX_RectF& GetWidgetRect() const; const CFX_RectF& RecacheWidgetRect() const; uint32_t GetStatus(); @@ -149,8 +152,6 @@ class CXFA_FFWidget : public CXFA_ContentLayoutItem { CXFA_Node* GetNode() const { return m_pNode.Get(); } - CXFA_FFDocView* GetDocView(); - void SetDocView(CXFA_FFDocView* pDocView); CXFA_FFDoc* GetDoc(); CXFA_FFApp* GetApp(); IXFA_AppProvider* GetAppProvider(); @@ -182,8 +183,8 @@ class CXFA_FFWidget : public CXFA_ContentLayoutItem { bool IsButtonDown(); void SetButtonDown(bool bSet); - CXFA_FFDocView* m_pDocView = nullptr; - CXFA_FFPageView* m_pPageView = nullptr; + UnownedPtr<CXFA_FFDocView> m_pDocView; + UnownedPtr<CXFA_FFPageView> m_pPageView; UnownedPtr<CXFA_Node> const m_pNode; mutable CFX_RectF m_rtWidget; }; |