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_annothandlermgr.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_annothandlermgr.cpp')
-rw-r--r-- | fpdfsdk/cpdfsdk_annothandlermgr.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/fpdfsdk/cpdfsdk_annothandlermgr.cpp b/fpdfsdk/cpdfsdk_annothandlermgr.cpp index 3dc3f09a07..ac22fe2d7b 100644 --- a/fpdfsdk/cpdfsdk_annothandlermgr.cpp +++ b/fpdfsdk/cpdfsdk_annothandlermgr.cpp @@ -130,7 +130,7 @@ bool CPDFSDK_AnnotHandlerMgr::Annot_OnLButtonDown( CPDFSDK_Annot::ObservedPtr* pAnnot, uint32_t nFlags, const CFX_PointF& point) { - ASSERT(*pAnnot); + ASSERT(pAnnot->HasObservable()); return GetAnnotHandler(pAnnot->Get()) ->OnLButtonDown(pPageView, pAnnot, nFlags, point); } @@ -140,7 +140,7 @@ bool CPDFSDK_AnnotHandlerMgr::Annot_OnLButtonUp( CPDFSDK_Annot::ObservedPtr* pAnnot, uint32_t nFlags, const CFX_PointF& point) { - ASSERT(*pAnnot); + ASSERT(pAnnot->HasObservable()); return GetAnnotHandler(pAnnot->Get()) ->OnLButtonUp(pPageView, pAnnot, nFlags, point); } @@ -150,7 +150,7 @@ bool CPDFSDK_AnnotHandlerMgr::Annot_OnMouseMove( CPDFSDK_Annot::ObservedPtr* pAnnot, uint32_t nFlags, const CFX_PointF& point) { - ASSERT(*pAnnot); + ASSERT(pAnnot->HasObservable()); return GetAnnotHandler(pAnnot->Get()) ->OnMouseMove(pPageView, pAnnot, nFlags, point); } @@ -161,7 +161,7 @@ bool CPDFSDK_AnnotHandlerMgr::Annot_OnMouseWheel( uint32_t nFlags, short zDelta, const CFX_PointF& point) { - ASSERT(*pAnnot); + ASSERT(pAnnot->HasObservable()); return GetAnnotHandler(pAnnot->Get()) ->OnMouseWheel(pPageView, pAnnot, nFlags, zDelta, point); } @@ -171,7 +171,7 @@ bool CPDFSDK_AnnotHandlerMgr::Annot_OnRButtonDown( CPDFSDK_Annot::ObservedPtr* pAnnot, uint32_t nFlags, const CFX_PointF& point) { - ASSERT(*pAnnot); + ASSERT(pAnnot->HasObservable()); return GetAnnotHandler(pAnnot->Get()) ->OnRButtonDown(pPageView, pAnnot, nFlags, point); } @@ -181,7 +181,7 @@ bool CPDFSDK_AnnotHandlerMgr::Annot_OnRButtonUp( CPDFSDK_Annot::ObservedPtr* pAnnot, uint32_t nFlags, const CFX_PointF& point) { - ASSERT(*pAnnot); + ASSERT(pAnnot->HasObservable()); return GetAnnotHandler(pAnnot->Get()) ->OnRButtonUp(pPageView, pAnnot, nFlags, point); } @@ -190,7 +190,7 @@ void CPDFSDK_AnnotHandlerMgr::Annot_OnMouseEnter( CPDFSDK_PageView* pPageView, CPDFSDK_Annot::ObservedPtr* pAnnot, uint32_t nFlag) { - ASSERT(*pAnnot); + ASSERT(pAnnot->HasObservable()); GetAnnotHandler(pAnnot->Get())->OnMouseEnter(pPageView, pAnnot, nFlag); } @@ -198,7 +198,7 @@ void CPDFSDK_AnnotHandlerMgr::Annot_OnMouseExit( CPDFSDK_PageView* pPageView, CPDFSDK_Annot::ObservedPtr* pAnnot, uint32_t nFlag) { - ASSERT(*pAnnot); + ASSERT(pAnnot->HasObservable()); GetAnnotHandler(pAnnot->Get())->OnMouseExit(pPageView, pAnnot, nFlag); } @@ -233,14 +233,14 @@ bool CPDFSDK_AnnotHandlerMgr::Annot_OnKeyDown(CPDFSDK_Annot* pAnnot, bool CPDFSDK_AnnotHandlerMgr::Annot_OnSetFocus( CPDFSDK_Annot::ObservedPtr* pAnnot, uint32_t nFlag) { - ASSERT(*pAnnot); + ASSERT(pAnnot->HasObservable()); return GetAnnotHandler(pAnnot->Get())->OnSetFocus(pAnnot, nFlag); } bool CPDFSDK_AnnotHandlerMgr::Annot_OnKillFocus( CPDFSDK_Annot::ObservedPtr* pAnnot, uint32_t nFlag) { - ASSERT(*pAnnot); + ASSERT(pAnnot->HasObservable()); return GetAnnotHandler(pAnnot->Get())->OnKillFocus(pAnnot, nFlag); } |