diff options
| author | Lei Zhang <thestig@chromium.org> | 2018-10-10 18:54:24 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-10-10 18:54:24 +0000 |
| commit | f0b7d5960d6c0bab6c4d8126be296b39f21c3134 (patch) | |
| tree | 412edb08430644dfc874e7fe44c480579a0d0387 /fpdfsdk/cpdfsdk_xfawidgethandler.cpp | |
| parent | 4f261fffddddd97602e88fe462fef1a18a0b4782 (diff) | |
| download | pdfium-f0b7d5960d6c0bab6c4d8126be296b39f21c3134.tar.xz | |
Add Observable::ObservedPtr::HasObservable().
if (pObserved->HasObservable()) is more readable than if (*pObserved).
Change-Id: I61ad3deb8e9f30cdc120a05555c2558f34489681
Reviewed-on: https://pdfium-review.googlesource.com/c/43811
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'fpdfsdk/cpdfsdk_xfawidgethandler.cpp')
| -rw-r--r-- | fpdfsdk/cpdfsdk_xfawidgethandler.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/fpdfsdk/cpdfsdk_xfawidgethandler.cpp b/fpdfsdk/cpdfsdk_xfawidgethandler.cpp index 75a5c12ba2..1660f86af3 100644 --- a/fpdfsdk/cpdfsdk_xfawidgethandler.cpp +++ b/fpdfsdk/cpdfsdk_xfawidgethandler.cpp @@ -180,7 +180,7 @@ bool CPDFSDK_XFAWidgetHandler::HitTest(CPDFSDK_PageView* pPageView, void CPDFSDK_XFAWidgetHandler::OnMouseEnter(CPDFSDK_PageView* pPageView, CPDFSDK_Annot::ObservedPtr* pAnnot, uint32_t nFlag) { - if (!pPageView || !(*pAnnot)) + if (!pPageView || !pAnnot->HasObservable()) return; CXFA_FFWidgetHandler* pWidgetHandler = GetXFAWidgetHandler(pAnnot->Get()); pWidgetHandler->OnMouseEnter((*pAnnot)->GetXFAWidget()); @@ -189,7 +189,7 @@ void CPDFSDK_XFAWidgetHandler::OnMouseEnter(CPDFSDK_PageView* pPageView, void CPDFSDK_XFAWidgetHandler::OnMouseExit(CPDFSDK_PageView* pPageView, CPDFSDK_Annot::ObservedPtr* pAnnot, uint32_t nFlag) { - if (!pPageView || !(*pAnnot)) + if (!pPageView || !pAnnot->HasObservable()) return; CXFA_FFWidgetHandler* pWidgetHandler = GetXFAWidgetHandler(pAnnot->Get()); @@ -200,7 +200,7 @@ bool CPDFSDK_XFAWidgetHandler::OnLButtonDown(CPDFSDK_PageView* pPageView, CPDFSDK_Annot::ObservedPtr* pAnnot, uint32_t nFlags, const CFX_PointF& point) { - if (!pPageView || !(*pAnnot)) + if (!pPageView || !pAnnot->HasObservable()) return false; CXFA_FFWidgetHandler* pWidgetHandler = GetXFAWidgetHandler(pAnnot->Get()); @@ -212,7 +212,7 @@ bool CPDFSDK_XFAWidgetHandler::OnLButtonUp(CPDFSDK_PageView* pPageView, CPDFSDK_Annot::ObservedPtr* pAnnot, uint32_t nFlags, const CFX_PointF& point) { - if (!pPageView || !(*pAnnot)) + if (!pPageView || !pAnnot->HasObservable()) return false; CXFA_FFWidgetHandler* pWidgetHandler = GetXFAWidgetHandler(pAnnot->Get()); @@ -225,7 +225,7 @@ bool CPDFSDK_XFAWidgetHandler::OnLButtonDblClk( CPDFSDK_Annot::ObservedPtr* pAnnot, uint32_t nFlags, const CFX_PointF& point) { - if (!pPageView || !(*pAnnot)) + if (!pPageView || !pAnnot->HasObservable()) return false; CXFA_FFWidgetHandler* pWidgetHandler = GetXFAWidgetHandler(pAnnot->Get()); @@ -237,7 +237,7 @@ bool CPDFSDK_XFAWidgetHandler::OnMouseMove(CPDFSDK_PageView* pPageView, CPDFSDK_Annot::ObservedPtr* pAnnot, uint32_t nFlags, const CFX_PointF& point) { - if (!pPageView || !(*pAnnot)) + if (!pPageView || !pAnnot->HasObservable()) return false; CXFA_FFWidgetHandler* pWidgetHandler = GetXFAWidgetHandler(pAnnot->Get()); @@ -250,7 +250,7 @@ bool CPDFSDK_XFAWidgetHandler::OnMouseWheel(CPDFSDK_PageView* pPageView, uint32_t nFlags, short zDelta, const CFX_PointF& point) { - if (!pPageView || !(*pAnnot)) + if (!pPageView || !pAnnot->HasObservable()) return false; CXFA_FFWidgetHandler* pWidgetHandler = GetXFAWidgetHandler(pAnnot->Get()); @@ -262,7 +262,7 @@ bool CPDFSDK_XFAWidgetHandler::OnRButtonDown(CPDFSDK_PageView* pPageView, CPDFSDK_Annot::ObservedPtr* pAnnot, uint32_t nFlags, const CFX_PointF& point) { - if (!pPageView || !(*pAnnot)) + if (!pPageView || !pAnnot->HasObservable()) return false; CXFA_FFWidgetHandler* pWidgetHandler = GetXFAWidgetHandler(pAnnot->Get()); @@ -274,7 +274,7 @@ bool CPDFSDK_XFAWidgetHandler::OnRButtonUp(CPDFSDK_PageView* pPageView, CPDFSDK_Annot::ObservedPtr* pAnnot, uint32_t nFlags, const CFX_PointF& point) { - if (!pPageView || !(*pAnnot)) + if (!pPageView || !pAnnot->HasObservable()) return false; CXFA_FFWidgetHandler* pWidgetHandler = GetXFAWidgetHandler(pAnnot->Get()); @@ -287,7 +287,7 @@ bool CPDFSDK_XFAWidgetHandler::OnRButtonDblClk( CPDFSDK_Annot::ObservedPtr* pAnnot, uint32_t nFlags, const CFX_PointF& point) { - if (!pPageView || !(*pAnnot)) + if (!pPageView || !pAnnot->HasObservable()) return false; CXFA_FFWidgetHandler* pWidgetHandler = GetXFAWidgetHandler(pAnnot->Get()); @@ -351,9 +351,9 @@ bool CPDFSDK_XFAWidgetHandler::OnXFAChangedFocus( CPDFSDK_Annot::ObservedPtr* pOldAnnot, CPDFSDK_Annot::ObservedPtr* pNewAnnot) { CXFA_FFWidgetHandler* pWidgetHandler = nullptr; - if (*pOldAnnot) + if (pOldAnnot->HasObservable()) pWidgetHandler = GetXFAWidgetHandler(pOldAnnot->Get()); - else if (*pNewAnnot) + else if (pNewAnnot->HasObservable()) pWidgetHandler = GetXFAWidgetHandler(pNewAnnot->Get()); if (!pWidgetHandler) |