From 4cf551577856f89103e162edc761def44ffb96fc Mon Sep 17 00:00:00 2001
From: tsepez <tsepez@chromium.org>
Date: Wed, 2 Nov 2016 14:37:54 -0700
Subject: Remove FX_BOOL from fpdfsdk.

Review-Url: https://codereview.chromium.org/2453683011
---
 fpdfsdk/cpdfsdk_baannothandler.h | 86 +++++++++++++++++++---------------------
 1 file changed, 41 insertions(+), 45 deletions(-)

(limited to 'fpdfsdk/cpdfsdk_baannothandler.h')

diff --git a/fpdfsdk/cpdfsdk_baannothandler.h b/fpdfsdk/cpdfsdk_baannothandler.h
index 66f8a0881b..2efed0e269 100644
--- a/fpdfsdk/cpdfsdk_baannothandler.h
+++ b/fpdfsdk/cpdfsdk_baannothandler.h
@@ -28,7 +28,7 @@ class CPDFSDK_BAAnnotHandler : public IPDFSDK_AnnotHandler {
   CPDFSDK_BAAnnotHandler();
   ~CPDFSDK_BAAnnotHandler() override;
 
-  FX_BOOL CanAnswer(CPDFSDK_Annot* pAnnot) override;
+  bool CanAnswer(CPDFSDK_Annot* pAnnot) override;
   CPDFSDK_Annot* NewAnnot(CPDF_Annot* pAnnot, CPDFSDK_PageView* pPage) override;
 #ifdef PDF_ENABLE_XFA
   CPDFSDK_Annot* NewAnnot(CXFA_FFWidget* hWidget,
@@ -37,9 +37,9 @@ class CPDFSDK_BAAnnotHandler : public IPDFSDK_AnnotHandler {
   void ReleaseAnnot(CPDFSDK_Annot* pAnnot) override;
   CFX_FloatRect GetViewBBox(CPDFSDK_PageView* pPageView,
                             CPDFSDK_Annot* pAnnot) override;
-  FX_BOOL HitTest(CPDFSDK_PageView* pPageView,
-                  CPDFSDK_Annot* pAnnot,
-                  const CFX_FloatPoint& point) override;
+  bool HitTest(CPDFSDK_PageView* pPageView,
+               CPDFSDK_Annot* pAnnot,
+               const CFX_FloatPoint& point) override;
   void OnDraw(CPDFSDK_PageView* pPageView,
               CPDFSDK_Annot* pAnnot,
               CFX_RenderDevice* pDevice,
@@ -53,51 +53,47 @@ class CPDFSDK_BAAnnotHandler : public IPDFSDK_AnnotHandler {
   void OnMouseExit(CPDFSDK_PageView* pPageView,
                    CPDFSDK_Annot::ObservedPtr* pAnnot,
                    uint32_t nFlag) override;
-  FX_BOOL OnLButtonDown(CPDFSDK_PageView* pPageView,
-                        CPDFSDK_Annot::ObservedPtr* pAnnot,
-                        uint32_t nFlags,
-                        const CFX_FloatPoint& point) override;
-  FX_BOOL OnLButtonUp(CPDFSDK_PageView* pPageView,
-                      CPDFSDK_Annot::ObservedPtr* pAnnot,
-                      uint32_t nFlags,
-                      const CFX_FloatPoint& point) override;
-  FX_BOOL OnLButtonDblClk(CPDFSDK_PageView* pPageView,
-                          CPDFSDK_Annot::ObservedPtr* pAnnot,
-                          uint32_t nFlags,
-                          const CFX_FloatPoint& point) override;
-  FX_BOOL OnMouseMove(CPDFSDK_PageView* pPageView,
-                      CPDFSDK_Annot::ObservedPtr* pAnnot,
-                      uint32_t nFlags,
-                      const CFX_FloatPoint& point) override;
-  FX_BOOL OnMouseWheel(CPDFSDK_PageView* pPageView,
+  bool OnLButtonDown(CPDFSDK_PageView* pPageView,
+                     CPDFSDK_Annot::ObservedPtr* pAnnot,
+                     uint32_t nFlags,
+                     const CFX_FloatPoint& point) override;
+  bool OnLButtonUp(CPDFSDK_PageView* pPageView,
+                   CPDFSDK_Annot::ObservedPtr* pAnnot,
+                   uint32_t nFlags,
+                   const CFX_FloatPoint& point) override;
+  bool OnLButtonDblClk(CPDFSDK_PageView* pPageView,
+                       CPDFSDK_Annot::ObservedPtr* pAnnot,
+                       uint32_t nFlags,
+                       const CFX_FloatPoint& point) override;
+  bool OnMouseMove(CPDFSDK_PageView* pPageView,
+                   CPDFSDK_Annot::ObservedPtr* pAnnot,
+                   uint32_t nFlags,
+                   const CFX_FloatPoint& point) override;
+  bool OnMouseWheel(CPDFSDK_PageView* pPageView,
+                    CPDFSDK_Annot::ObservedPtr* pAnnot,
+                    uint32_t nFlags,
+                    short zDelta,
+                    const CFX_FloatPoint& point) override;
+  bool OnRButtonDown(CPDFSDK_PageView* pPageView,
+                     CPDFSDK_Annot::ObservedPtr* pAnnot,
+                     uint32_t nFlags,
+                     const CFX_FloatPoint& point) override;
+  bool OnRButtonUp(CPDFSDK_PageView* pPageView,
+                   CPDFSDK_Annot::ObservedPtr* pAnnot,
+                   uint32_t nFlags,
+                   const CFX_FloatPoint& point) override;
+  bool OnRButtonDblClk(CPDFSDK_PageView* pPageView,
                        CPDFSDK_Annot::ObservedPtr* pAnnot,
                        uint32_t nFlags,
-                       short zDelta,
                        const CFX_FloatPoint& point) override;
-  FX_BOOL OnRButtonDown(CPDFSDK_PageView* pPageView,
-                        CPDFSDK_Annot::ObservedPtr* pAnnot,
-                        uint32_t nFlags,
-                        const CFX_FloatPoint& point) override;
-  FX_BOOL OnRButtonUp(CPDFSDK_PageView* pPageView,
-                      CPDFSDK_Annot::ObservedPtr* pAnnot,
-                      uint32_t nFlags,
-                      const CFX_FloatPoint& point) override;
-  FX_BOOL OnRButtonDblClk(CPDFSDK_PageView* pPageView,
-                          CPDFSDK_Annot::ObservedPtr* pAnnot,
-                          uint32_t nFlags,
-                          const CFX_FloatPoint& point) override;
-  FX_BOOL OnChar(CPDFSDK_Annot* pAnnot,
-                 uint32_t nChar,
-                 uint32_t nFlags) override;
-  FX_BOOL OnKeyDown(CPDFSDK_Annot* pAnnot, int nKeyCode, int nFlag) override;
-  FX_BOOL OnKeyUp(CPDFSDK_Annot* pAnnot, int nKeyCode, int nFlag) override;
-  FX_BOOL OnSetFocus(CPDFSDK_Annot::ObservedPtr* pAnnot,
-                     uint32_t nFlag) override;
-  FX_BOOL OnKillFocus(CPDFSDK_Annot::ObservedPtr* pAnnot,
-                      uint32_t nFlag) override;
+  bool OnChar(CPDFSDK_Annot* pAnnot, uint32_t nChar, uint32_t nFlags) override;
+  bool OnKeyDown(CPDFSDK_Annot* pAnnot, int nKeyCode, int nFlag) override;
+  bool OnKeyUp(CPDFSDK_Annot* pAnnot, int nKeyCode, int nFlag) override;
+  bool OnSetFocus(CPDFSDK_Annot::ObservedPtr* pAnnot, uint32_t nFlag) override;
+  bool OnKillFocus(CPDFSDK_Annot::ObservedPtr* pAnnot, uint32_t nFlag) override;
 #ifdef PDF_ENABLE_XFA
-  FX_BOOL OnXFAChangedFocus(CPDFSDK_Annot::ObservedPtr* pOldAnnot,
-                            CPDFSDK_Annot::ObservedPtr* pNewAnnot) override;
+  bool OnXFAChangedFocus(CPDFSDK_Annot::ObservedPtr* pOldAnnot,
+                         CPDFSDK_Annot::ObservedPtr* pNewAnnot) override;
 #endif  // PDF_ENABLE_XFA
 };
 
-- 
cgit v1.2.3