From 89fcde88f0c03da77d7fd83dece7726d66fd190e Mon Sep 17 00:00:00 2001
From: dsinclair <dsinclair@chromium.org>
Date: Tue, 3 May 2016 13:00:25 -0700
Subject: Remove FWL_WGTHITTEST_* defines in favour of enum class.

This Cl updates the FWL_WGTHITTEST_ defines to an enum class and fixes up any
code issues.

Review-Url: https://codereview.chromium.org/1948583002
---
 xfa/fwl/lightwidget/cfwl_widget.cpp | 4 ++--
 xfa/fwl/lightwidget/cfwl_widget.h   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'xfa/fwl/lightwidget')

diff --git a/xfa/fwl/lightwidget/cfwl_widget.cpp b/xfa/fwl/lightwidget/cfwl_widget.cpp
index 98a5a22f43..ff28b37646 100644
--- a/xfa/fwl/lightwidget/cfwl_widget.cpp
+++ b/xfa/fwl/lightwidget/cfwl_widget.cpp
@@ -164,9 +164,9 @@ FWL_ERR CFWL_Widget::UnlockUpdate() {
   return m_pIface->UnlockUpdate();
 }
 
-uint32_t CFWL_Widget::HitTest(FX_FLOAT fx, FX_FLOAT fy) {
+FWL_WidgetHit CFWL_Widget::HitTest(FX_FLOAT fx, FX_FLOAT fy) {
   if (!m_pIface)
-    return 0;
+    return FWL_WidgetHit::Unknown;
   return m_pIface->HitTest(fx, fy);
 }
 
diff --git a/xfa/fwl/lightwidget/cfwl_widget.h b/xfa/fwl/lightwidget/cfwl_widget.h
index f1b6715811..19b22c6f29 100644
--- a/xfa/fwl/lightwidget/cfwl_widget.h
+++ b/xfa/fwl/lightwidget/cfwl_widget.h
@@ -46,7 +46,7 @@ class CFWL_Widget {
   FWL_ERR Update();
   FWL_ERR LockUpdate();
   FWL_ERR UnlockUpdate();
-  uint32_t HitTest(FX_FLOAT fx, FX_FLOAT fy);
+  FWL_WidgetHit HitTest(FX_FLOAT fx, FX_FLOAT fy);
   FWL_ERR TransformTo(CFWL_Widget* pWidget, FX_FLOAT& fx, FX_FLOAT& fy);
   FWL_ERR TransformTo(CFWL_Widget* pWidget, CFX_RectF& rt);
   FWL_ERR GetMatrix(CFX_Matrix& matrix, FX_BOOL bGlobal = FALSE);
-- 
cgit v1.2.3