Rename CXFA_FFWidget::OnHitTest() to HitTest()
This isn't an On* event which may trigger all sorts of additional
actions -- it merely performs a hit test. A follow-up patch may
take additional care with On* actions, so get this out of the way
first.
-- Lump the On* functions together in cxfa_ffwidget.h
-- tidy a few nits along the way.
Change-Id: I87a800438bcae4890ef18da37c99d936a044845c
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/64790
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
diff --git a/fpdfsdk/fpdfxfa/cpdfxfa_widgethandler.cpp b/fpdfsdk/fpdfxfa/cpdfxfa_widgethandler.cpp
index 3b58b3b..3012b0d 100644
--- a/fpdfsdk/fpdfxfa/cpdfxfa_widgethandler.cpp
+++ b/fpdfsdk/fpdfxfa/cpdfxfa_widgethandler.cpp
@@ -355,12 +355,9 @@
return false;
CXFA_FFWidgetHandler* pWidgetHandler = pDocView->GetWidgetHandler();
- if (!pWidgetHandler)
- return false;
-
- FWL_WidgetHit dwHitTest =
- pWidgetHandler->OnHitTest(pXFAWidget->GetXFAFFWidget(), point);
- return dwHitTest != FWL_WidgetHit::Unknown;
+ return pWidgetHandler &&
+ pWidgetHandler->HitTest(pXFAWidget->GetXFAFFWidget(), point) !=
+ FWL_WidgetHit::Unknown;
}
void CPDFXFA_WidgetHandler::OnMouseEnter(CPDFSDK_PageView* pPageView,
diff --git a/xfa/fxfa/cxfa_fffield.cpp b/xfa/fxfa/cxfa_fffield.cpp
index 217fe2c..47be2b7 100644
--- a/xfa/fxfa/cxfa_fffield.cpp
+++ b/xfa/fxfa/cxfa_fffield.cpp
@@ -549,12 +549,10 @@
return true;
}
-FWL_WidgetHit CXFA_FFField::OnHitTest(const CFX_PointF& point) {
- if (GetNormalWidget() && GetNormalWidget()->HitTest(FWLToClient(point)) !=
- FWL_WidgetHit::Unknown) {
+FWL_WidgetHit CXFA_FFField::HitTest(const CFX_PointF& point) {
+ auto* pNorm = GetNormalWidget();
+ if (pNorm && pNorm->HitTest(FWLToClient(point)) != FWL_WidgetHit::Unknown)
return FWL_WidgetHit::Client;
- }
-
if (!GetRectWithoutRotate().Contains(point))
return FWL_WidgetHit::Unknown;
if (m_rtCaption.Contains(point))
diff --git a/xfa/fxfa/cxfa_fffield.h b/xfa/fxfa/cxfa_fffield.h
index 2f7b290..76cb0f8 100644
--- a/xfa/fxfa/cxfa_fffield.h
+++ b/xfa/fxfa/cxfa_fffield.h
@@ -34,11 +34,11 @@
bool IsLoaded() override;
bool LoadWidget() override;
bool PerformLayout() override;
- bool OnMouseEnter() override;
- bool OnMouseExit() override;
bool AcceptsFocusOnButtonDown(uint32_t dwFlags,
const CFX_PointF& point,
FWL_MouseCommand command) override;
+ bool OnMouseEnter() override;
+ bool OnMouseExit() override;
void OnLButtonDown(uint32_t dwFlags, const CFX_PointF& point) override;
bool OnLButtonUp(uint32_t dwFlags, const CFX_PointF& point) override;
bool OnLButtonDblClk(uint32_t dwFlags, const CFX_PointF& point) override;
@@ -54,8 +54,8 @@
bool OnKeyDown(uint32_t dwKeyCode, uint32_t dwFlags) override;
bool OnKeyUp(uint32_t dwKeyCode, uint32_t dwFlags) override;
bool OnChar(uint32_t dwChar, uint32_t dwFlags) override;
- FWL_WidgetHit OnHitTest(const CFX_PointF& point) override;
bool OnSetCursor(const CFX_PointF& point) override;
+ FWL_WidgetHit HitTest(const CFX_PointF& point) override;
// IFWL_WidgetDelegate
void OnProcessMessage(CFWL_Message* pMessage) override;
diff --git a/xfa/fxfa/cxfa_ffsignature.cpp b/xfa/fxfa/cxfa_ffsignature.cpp
index 9de23b6..46ca02f 100644
--- a/xfa/fxfa/cxfa_ffsignature.cpp
+++ b/xfa/fxfa/cxfa_ffsignature.cpp
@@ -97,12 +97,10 @@
return false;
}
-FWL_WidgetHit CXFA_FFSignature::OnHitTest(const CFX_PointF& point) {
- if (GetNormalWidget() && GetNormalWidget()->HitTest(FWLToClient(point)) !=
- FWL_WidgetHit::Unknown) {
+FWL_WidgetHit CXFA_FFSignature::HitTest(const CFX_PointF& point) {
+ auto* pNorm = GetNormalWidget();
+ if (pNorm && pNorm->HitTest(FWLToClient(point)) != FWL_WidgetHit::Unknown)
return FWL_WidgetHit::Client;
- }
-
if (!GetRectWithoutRotate().Contains(point))
return FWL_WidgetHit::Unknown;
if (m_rtCaption.Contains(point))
diff --git a/xfa/fxfa/cxfa_ffsignature.h b/xfa/fxfa/cxfa_ffsignature.h
index a08c0ac..1656127 100644
--- a/xfa/fxfa/cxfa_ffsignature.h
+++ b/xfa/fxfa/cxfa_ffsignature.h
@@ -19,11 +19,11 @@
const CFX_Matrix& matrix,
HighlightOption highlight) override;
bool LoadWidget() override;
- bool OnMouseEnter() override;
- bool OnMouseExit() override;
bool AcceptsFocusOnButtonDown(uint32_t dwFlags,
const CFX_PointF& point,
FWL_MouseCommand command) override;
+ bool OnMouseEnter() override;
+ bool OnMouseExit() override;
void OnLButtonDown(uint32_t dwFlags, const CFX_PointF& point) override;
bool OnLButtonUp(uint32_t dwFlags, const CFX_PointF& point) override;
bool OnLButtonDblClk(uint32_t dwFlags, const CFX_PointF& point) override;
@@ -38,8 +38,8 @@
bool OnKeyDown(uint32_t dwKeyCode, uint32_t dwFlags) override;
bool OnKeyUp(uint32_t dwKeyCode, uint32_t dwFlags) override;
bool OnChar(uint32_t dwChar, uint32_t dwFlags) override;
- FWL_WidgetHit OnHitTest(const CFX_PointF& point) override;
bool OnSetCursor(const CFX_PointF& point) override;
+ FWL_WidgetHit HitTest(const CFX_PointF& point) override;
FormFieldType GetFormFieldType() override;
};
diff --git a/xfa/fxfa/cxfa_fftext.cpp b/xfa/fxfa/cxfa_fftext.cpp
index 75f0ece..b6e8e61 100644
--- a/xfa/fxfa/cxfa_fftext.cpp
+++ b/xfa/fxfa/cxfa_fftext.cpp
@@ -137,7 +137,7 @@
return true;
}
-FWL_WidgetHit CXFA_FFText::OnHitTest(const CFX_PointF& point) {
+FWL_WidgetHit CXFA_FFText::HitTest(const CFX_PointF& point) {
if (!GetRectWithoutRotate().Contains(point))
return FWL_WidgetHit::Unknown;
if (!GetLinkURLAtPoint(point))
diff --git a/xfa/fxfa/cxfa_fftext.h b/xfa/fxfa/cxfa_fftext.h
index bad1c87..abcb51a 100644
--- a/xfa/fxfa/cxfa_fftext.h
+++ b/xfa/fxfa/cxfa_fftext.h
@@ -21,7 +21,7 @@
void OnLButtonDown(uint32_t dwFlags, const CFX_PointF& point) override;
bool OnLButtonUp(uint32_t dwFlags, const CFX_PointF& point) override;
bool OnMouseMove(uint32_t dwFlags, const CFX_PointF& point) override;
- FWL_WidgetHit OnHitTest(const CFX_PointF& point) override;
+ FWL_WidgetHit HitTest(const CFX_PointF& point) override;
void RenderWidget(CXFA_Graphics* pGS,
const CFX_Matrix& matrix,
HighlightOption highlight) override;
diff --git a/xfa/fxfa/cxfa_ffwidget.cpp b/xfa/fxfa/cxfa_ffwidget.cpp
index f6ea8ae..d134b0b 100644
--- a/xfa/fxfa/cxfa_ffwidget.cpp
+++ b/xfa/fxfa/cxfa_ffwidget.cpp
@@ -473,7 +473,7 @@
return false;
}
-FWL_WidgetHit CXFA_FFWidget::OnHitTest(const CFX_PointF& point) {
+FWL_WidgetHit CXFA_FFWidget::HitTest(const CFX_PointF& point) {
return FWL_WidgetHit::Unknown;
}
diff --git a/xfa/fxfa/cxfa_ffwidget.h b/xfa/fxfa/cxfa_ffwidget.h
index 253e772..e0f9ee3 100644
--- a/xfa/fxfa/cxfa_ffwidget.h
+++ b/xfa/fxfa/cxfa_ffwidget.h
@@ -86,12 +86,12 @@
virtual bool PerformLayout();
virtual bool UpdateFWLData();
virtual void UpdateWidgetProperty();
- virtual bool OnMouseEnter();
- virtual bool OnMouseExit();
// |command| must be LeftButtonDown or RightButtonDown.
virtual bool AcceptsFocusOnButtonDown(uint32_t dwFlags,
const CFX_PointF& point,
FWL_MouseCommand command);
+ virtual bool OnMouseEnter();
+ virtual bool OnMouseExit();
virtual void OnLButtonDown(uint32_t dwFlags, const CFX_PointF& point);
virtual bool OnLButtonUp(uint32_t dwFlags, const CFX_PointF& point);
virtual bool OnLButtonDblClk(uint32_t dwFlags, const CFX_PointF& point);
@@ -110,8 +110,8 @@
virtual bool OnKeyDown(uint32_t dwKeyCode, uint32_t dwFlags);
virtual bool OnKeyUp(uint32_t dwKeyCode, uint32_t dwFlags);
virtual bool OnChar(uint32_t dwChar, uint32_t dwFlags);
- virtual FWL_WidgetHit OnHitTest(const CFX_PointF& point);
virtual bool OnSetCursor(const CFX_PointF& point);
+ virtual FWL_WidgetHit HitTest(const CFX_PointF& point);
virtual bool CanUndo();
virtual bool CanRedo();
virtual bool Undo();
diff --git a/xfa/fxfa/cxfa_ffwidgethandler.cpp b/xfa/fxfa/cxfa_ffwidgethandler.cpp
index c2277fc..29ea34e 100644
--- a/xfa/fxfa/cxfa_ffwidgethandler.cpp
+++ b/xfa/fxfa/cxfa_ffwidgethandler.cpp
@@ -182,11 +182,11 @@
return widget->Redo();
}
-FWL_WidgetHit CXFA_FFWidgetHandler::OnHitTest(CXFA_FFWidget* pWidget,
- const CFX_PointF& point) {
+FWL_WidgetHit CXFA_FFWidgetHandler::HitTest(CXFA_FFWidget* pWidget,
+ const CFX_PointF& point) {
if (!pWidget->GetLayoutItem()->TestStatusBits(XFA_WidgetStatus_Visible))
return FWL_WidgetHit::Unknown;
- return pWidget->OnHitTest(pWidget->Rotate2Normal(point));
+ return pWidget->HitTest(pWidget->Rotate2Normal(point));
}
bool CXFA_FFWidgetHandler::OnSetCursor(CXFA_FFWidget* hWidget,
diff --git a/xfa/fxfa/cxfa_ffwidgethandler.h b/xfa/fxfa/cxfa_ffwidgethandler.h
index 2969e8e..93402f1 100644
--- a/xfa/fxfa/cxfa_ffwidgethandler.h
+++ b/xfa/fxfa/cxfa_ffwidgethandler.h
@@ -65,8 +65,8 @@
bool OnKeyDown(CXFA_FFWidget* hWidget, uint32_t dwKeyCode, uint32_t dwFlags);
bool OnKeyUp(CXFA_FFWidget* hWidget, uint32_t dwKeyCode, uint32_t dwFlags);
bool OnChar(CXFA_FFWidget* hWidget, uint32_t dwChar, uint32_t dwFlags);
- FWL_WidgetHit OnHitTest(CXFA_FFWidget* pWidget, const CFX_PointF& point);
bool OnSetCursor(CXFA_FFWidget* hWidget, const CFX_PointF& point);
+ FWL_WidgetHit HitTest(CXFA_FFWidget* pWidget, const CFX_PointF& point);
void RenderWidget(CXFA_FFWidget* hWidget,
CXFA_Graphics* pGS,
const CFX_Matrix& matrix,
