Index: fpdfsdk/cpdfsdk_xfawidgethandler.cpp |
diff --git a/fpdfsdk/cpdfsdk_xfawidgethandler.cpp b/fpdfsdk/cpdfsdk_xfawidgethandler.cpp |
index fc39473b041f5c52542f49be8c0d10bafef8159e..0cf91a780a0461a95c38a3c4fdc76cc214cf5b85 100644 |
--- a/fpdfsdk/cpdfsdk_xfawidgethandler.cpp |
+++ b/fpdfsdk/cpdfsdk_xfawidgethandler.cpp |
@@ -138,117 +138,125 @@ FX_BOOL CPDFSDK_XFAWidgetHandler::HitTest(CPDFSDK_PageView* pPageView, |
} |
void CPDFSDK_XFAWidgetHandler::OnMouseEnter(CPDFSDK_PageView* pPageView, |
- CPDFSDK_Annot* pAnnot, |
+ CPDFSDK_Annot::ObservedPtr& pAnnot, |
uint32_t nFlag) { |
if (!pPageView || !pAnnot) |
return; |
- CXFA_FFWidgetHandler* pWidgetHandler = GetXFAWidgetHandler(pAnnot); |
+ CXFA_FFWidgetHandler* pWidgetHandler = GetXFAWidgetHandler(pAnnot.Get()); |
pWidgetHandler->OnMouseEnter(pAnnot->GetXFAWidget()); |
} |
void CPDFSDK_XFAWidgetHandler::OnMouseExit(CPDFSDK_PageView* pPageView, |
- CPDFSDK_Annot* pAnnot, |
+ CPDFSDK_Annot::ObservedPtr& pAnnot, |
uint32_t nFlag) { |
if (!pPageView || !pAnnot) |
return; |
- CXFA_FFWidgetHandler* pWidgetHandler = GetXFAWidgetHandler(pAnnot); |
+ CXFA_FFWidgetHandler* pWidgetHandler = GetXFAWidgetHandler(pAnnot.Get()); |
pWidgetHandler->OnMouseExit(pAnnot->GetXFAWidget()); |
} |
-FX_BOOL CPDFSDK_XFAWidgetHandler::OnLButtonDown(CPDFSDK_PageView* pPageView, |
- CPDFSDK_Annot* pAnnot, |
- uint32_t nFlags, |
- const CFX_FloatPoint& point) { |
+FX_BOOL CPDFSDK_XFAWidgetHandler::OnLButtonDown( |
+ CPDFSDK_PageView* pPageView, |
+ CPDFSDK_Annot::ObservedPtr& pAnnot, |
+ uint32_t nFlags, |
+ const CFX_FloatPoint& point) { |
if (!pPageView || !pAnnot) |
return FALSE; |
- CXFA_FFWidgetHandler* pWidgetHandler = GetXFAWidgetHandler(pAnnot); |
+ CXFA_FFWidgetHandler* pWidgetHandler = GetXFAWidgetHandler(pAnnot.Get()); |
return pWidgetHandler->OnLButtonDown(pAnnot->GetXFAWidget(), |
GetFWLFlags(nFlags), point.x, point.y); |
} |
-FX_BOOL CPDFSDK_XFAWidgetHandler::OnLButtonUp(CPDFSDK_PageView* pPageView, |
- CPDFSDK_Annot* pAnnot, |
- uint32_t nFlags, |
- const CFX_FloatPoint& point) { |
+FX_BOOL CPDFSDK_XFAWidgetHandler::OnLButtonUp( |
+ CPDFSDK_PageView* pPageView, |
+ CPDFSDK_Annot::ObservedPtr& pAnnot, |
+ uint32_t nFlags, |
+ const CFX_FloatPoint& point) { |
if (!pPageView || !pAnnot) |
return FALSE; |
- CXFA_FFWidgetHandler* pWidgetHandler = GetXFAWidgetHandler(pAnnot); |
+ CXFA_FFWidgetHandler* pWidgetHandler = GetXFAWidgetHandler(pAnnot.Get()); |
return pWidgetHandler->OnLButtonUp(pAnnot->GetXFAWidget(), |
GetFWLFlags(nFlags), point.x, point.y); |
} |
-FX_BOOL CPDFSDK_XFAWidgetHandler::OnLButtonDblClk(CPDFSDK_PageView* pPageView, |
- CPDFSDK_Annot* pAnnot, |
- uint32_t nFlags, |
- const CFX_FloatPoint& point) { |
+FX_BOOL CPDFSDK_XFAWidgetHandler::OnLButtonDblClk( |
+ CPDFSDK_PageView* pPageView, |
+ CPDFSDK_Annot::ObservedPtr& pAnnot, |
+ uint32_t nFlags, |
+ const CFX_FloatPoint& point) { |
if (!pPageView || !pAnnot) |
return FALSE; |
- CXFA_FFWidgetHandler* pWidgetHandler = GetXFAWidgetHandler(pAnnot); |
+ CXFA_FFWidgetHandler* pWidgetHandler = GetXFAWidgetHandler(pAnnot.Get()); |
return pWidgetHandler->OnLButtonDblClk(pAnnot->GetXFAWidget(), |
GetFWLFlags(nFlags), point.x, point.y); |
} |
-FX_BOOL CPDFSDK_XFAWidgetHandler::OnMouseMove(CPDFSDK_PageView* pPageView, |
- CPDFSDK_Annot* pAnnot, |
- uint32_t nFlags, |
- const CFX_FloatPoint& point) { |
+FX_BOOL CPDFSDK_XFAWidgetHandler::OnMouseMove( |
+ CPDFSDK_PageView* pPageView, |
+ CPDFSDK_Annot::ObservedPtr& pAnnot, |
+ uint32_t nFlags, |
+ const CFX_FloatPoint& point) { |
if (!pPageView || !pAnnot) |
return FALSE; |
- CXFA_FFWidgetHandler* pWidgetHandler = GetXFAWidgetHandler(pAnnot); |
+ CXFA_FFWidgetHandler* pWidgetHandler = GetXFAWidgetHandler(pAnnot.Get()); |
return pWidgetHandler->OnMouseMove(pAnnot->GetXFAWidget(), |
GetFWLFlags(nFlags), point.x, point.y); |
} |
-FX_BOOL CPDFSDK_XFAWidgetHandler::OnMouseWheel(CPDFSDK_PageView* pPageView, |
- CPDFSDK_Annot* pAnnot, |
- uint32_t nFlags, |
- short zDelta, |
- const CFX_FloatPoint& point) { |
+FX_BOOL CPDFSDK_XFAWidgetHandler::OnMouseWheel( |
+ CPDFSDK_PageView* pPageView, |
+ CPDFSDK_Annot::ObservedPtr& pAnnot, |
+ uint32_t nFlags, |
+ short zDelta, |
+ const CFX_FloatPoint& point) { |
if (!pPageView || !pAnnot) |
return FALSE; |
- CXFA_FFWidgetHandler* pWidgetHandler = GetXFAWidgetHandler(pAnnot); |
+ CXFA_FFWidgetHandler* pWidgetHandler = GetXFAWidgetHandler(pAnnot.Get()); |
return pWidgetHandler->OnMouseWheel( |
pAnnot->GetXFAWidget(), GetFWLFlags(nFlags), zDelta, point.x, point.y); |
} |
-FX_BOOL CPDFSDK_XFAWidgetHandler::OnRButtonDown(CPDFSDK_PageView* pPageView, |
- CPDFSDK_Annot* pAnnot, |
- uint32_t nFlags, |
- const CFX_FloatPoint& point) { |
+FX_BOOL CPDFSDK_XFAWidgetHandler::OnRButtonDown( |
+ CPDFSDK_PageView* pPageView, |
+ CPDFSDK_Annot::ObservedPtr& pAnnot, |
+ uint32_t nFlags, |
+ const CFX_FloatPoint& point) { |
if (!pPageView || !pAnnot) |
return FALSE; |
- CXFA_FFWidgetHandler* pWidgetHandler = GetXFAWidgetHandler(pAnnot); |
+ CXFA_FFWidgetHandler* pWidgetHandler = GetXFAWidgetHandler(pAnnot.Get()); |
return pWidgetHandler->OnRButtonDown(pAnnot->GetXFAWidget(), |
GetFWLFlags(nFlags), point.x, point.y); |
} |
-FX_BOOL CPDFSDK_XFAWidgetHandler::OnRButtonUp(CPDFSDK_PageView* pPageView, |
- CPDFSDK_Annot* pAnnot, |
- uint32_t nFlags, |
- const CFX_FloatPoint& point) { |
+FX_BOOL CPDFSDK_XFAWidgetHandler::OnRButtonUp( |
+ CPDFSDK_PageView* pPageView, |
+ CPDFSDK_Annot::ObservedPtr& pAnnot, |
+ uint32_t nFlags, |
+ const CFX_FloatPoint& point) { |
if (!pPageView || !pAnnot) |
return FALSE; |
- CXFA_FFWidgetHandler* pWidgetHandler = GetXFAWidgetHandler(pAnnot); |
+ CXFA_FFWidgetHandler* pWidgetHandler = GetXFAWidgetHandler(pAnnot.Get()); |
return pWidgetHandler->OnRButtonUp(pAnnot->GetXFAWidget(), |
GetFWLFlags(nFlags), point.x, point.y); |
} |
-FX_BOOL CPDFSDK_XFAWidgetHandler::OnRButtonDblClk(CPDFSDK_PageView* pPageView, |
- CPDFSDK_Annot* pAnnot, |
- uint32_t nFlags, |
- const CFX_FloatPoint& point) { |
+FX_BOOL CPDFSDK_XFAWidgetHandler::OnRButtonDblClk( |
+ CPDFSDK_PageView* pPageView, |
+ CPDFSDK_Annot::ObservedPtr& pAnnot, |
+ uint32_t nFlags, |
+ const CFX_FloatPoint& point) { |
if (!pPageView || !pAnnot) |
return FALSE; |
- CXFA_FFWidgetHandler* pWidgetHandler = GetXFAWidgetHandler(pAnnot); |
+ CXFA_FFWidgetHandler* pWidgetHandler = GetXFAWidgetHandler(pAnnot.Get()); |
return pWidgetHandler->OnRButtonDblClk(pAnnot->GetXFAWidget(), |
GetFWLFlags(nFlags), point.x, point.y); |
} |
@@ -290,24 +298,25 @@ void CPDFSDK_XFAWidgetHandler::OnDeSelected(CPDFSDK_Annot* pAnnot) {} |
void CPDFSDK_XFAWidgetHandler::OnSelected(CPDFSDK_Annot* pAnnot) {} |
-FX_BOOL CPDFSDK_XFAWidgetHandler::OnSetFocus(CPDFSDK_Annot* pAnnot, |
+FX_BOOL CPDFSDK_XFAWidgetHandler::OnSetFocus(CPDFSDK_Annot::ObservedPtr& pAnnot, |
uint32_t nFlag) { |
return TRUE; |
} |
-FX_BOOL CPDFSDK_XFAWidgetHandler::OnKillFocus(CPDFSDK_Annot* pAnnot, |
- uint32_t nFlag) { |
+FX_BOOL CPDFSDK_XFAWidgetHandler::OnKillFocus( |
+ CPDFSDK_Annot::ObservedPtr& pAnnot, |
+ uint32_t nFlag) { |
return TRUE; |
} |
-FX_BOOL CPDFSDK_XFAWidgetHandler::OnXFAChangedFocus(CPDFSDK_Annot* pOldAnnot, |
- CPDFSDK_Annot* pNewAnnot) { |
+FX_BOOL CPDFSDK_XFAWidgetHandler::OnXFAChangedFocus( |
+ CPDFSDK_Annot::ObservedPtr& pOldAnnot, |
+ CPDFSDK_Annot::ObservedPtr& pNewAnnot) { |
CXFA_FFWidgetHandler* pWidgetHandler = nullptr; |
- |
if (pOldAnnot) |
- pWidgetHandler = GetXFAWidgetHandler(pOldAnnot); |
+ pWidgetHandler = GetXFAWidgetHandler(pOldAnnot.Get()); |
else if (pNewAnnot) |
- pWidgetHandler = GetXFAWidgetHandler(pNewAnnot); |
+ pWidgetHandler = GetXFAWidgetHandler(pNewAnnot.Get()); |
if (pWidgetHandler) { |
FX_BOOL bRet = TRUE; |