From ff46aaf499edcf153ee2f57c7016587aa96dcfa0 Mon Sep 17 00:00:00 2001
From: Tom Sepez <tsepez@chromium.org>
Date: Mon, 27 Jul 2015 11:55:29 -0700
Subject: FX Bool considered harmful, part 3

Try to reland this patch after fixing underlying issues that
caused it to be reverted.

fx_system.h is the only manual edit.

R=thestig@chromium.org

Review URL: https://codereview.chromium.org/1258093002 .
---
 fpdfsdk/src/fpdfformfill.cpp | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'fpdfsdk/src/fpdfformfill.cpp')

diff --git a/fpdfsdk/src/fpdfformfill.cpp b/fpdfsdk/src/fpdfformfill.cpp
index d21d5d209d..21a441ca57 100644
--- a/fpdfsdk/src/fpdfformfill.cpp
+++ b/fpdfsdk/src/fpdfformfill.cpp
@@ -28,7 +28,7 @@ CPDFSDK_InterForm* FormHandleToInterForm(FPDF_FORMHANDLE hHandle)
 CPDFSDK_PageView* FormHandleToPageView(FPDF_FORMHANDLE hHandle, FPDF_PAGE page)
 {
     CPDFSDK_Document* pSDKDoc = FormHandleToSDKDoc(hHandle);
-    return pSDKDoc ? pSDKDoc->GetPageView((CPDF_Page*)page, TRUE) : nullptr;
+    return pSDKDoc ? pSDKDoc->GetPageView((CPDF_Page*)page, true) : nullptr;
 }
 
 }  // namespace
@@ -41,7 +41,7 @@ DLLEXPORT int STDCALL FPDPage_HasFormFieldAtPoint(
     CPDF_Page* pPage = (CPDF_Page*) page;
 
     nonstd::unique_ptr<CPDF_InterForm> pInterForm(
-        new CPDF_InterForm(pPage->m_pDocument, FALSE));
+        new CPDF_InterForm(pPage->m_pDocument, false));
     CPDF_FormControl* pFormCtrl = pInterForm->GetControlAtPoint(
         pPage, (FX_FLOAT)page_x, (FX_FLOAT)page_y);
     if (!pFormCtrl)
@@ -84,7 +84,7 @@ DLLEXPORT FPDF_BOOL STDCALL FORM_OnMouseMove(FPDF_FORMHANDLE hHandle, FPDF_PAGE
 {
     CPDFSDK_PageView* pPageView = FormHandleToPageView(hHandle, page);
     if (!pPageView)
-        return FALSE;
+        return false;
 
     CPDF_Point pt((FX_FLOAT)page_x, (FX_FLOAT)page_y);
     return pPageView->OnMouseMove(pt, modifier);
@@ -94,7 +94,7 @@ DLLEXPORT FPDF_BOOL STDCALL FORM_OnLButtonDown(FPDF_FORMHANDLE hHandle, FPDF_PAG
 {
     CPDFSDK_PageView* pPageView = FormHandleToPageView(hHandle, page);
     if (!pPageView)
-        return FALSE;
+        return false;
 
     CPDF_Point pt((FX_FLOAT)page_x, (FX_FLOAT)page_y);
     return pPageView->OnLButtonDown(pt, modifier);
@@ -104,7 +104,7 @@ DLLEXPORT FPDF_BOOL STDCALL FORM_OnLButtonUp(FPDF_FORMHANDLE hHandle, FPDF_PAGE
 {
     CPDFSDK_PageView* pPageView = FormHandleToPageView(hHandle, page);
     if (!pPageView)
-        return FALSE;
+        return false;
 
     CPDF_Point pt((FX_FLOAT)page_x, (FX_FLOAT)page_y);
     return pPageView->OnLButtonUp(pt, modifier);
@@ -114,7 +114,7 @@ DLLEXPORT FPDF_BOOL STDCALL FORM_OnKeyDown(FPDF_FORMHANDLE hHandle, FPDF_PAGE pa
 {
     CPDFSDK_PageView* pPageView = FormHandleToPageView(hHandle, page);
     if (!pPageView)
-        return FALSE;
+        return false;
 
     return pPageView->OnKeyDown(nKeyCode, modifier);
 }
@@ -123,7 +123,7 @@ DLLEXPORT FPDF_BOOL STDCALL FORM_OnKeyUp(FPDF_FORMHANDLE hHandle, FPDF_PAGE page
 {
     CPDFSDK_PageView* pPageView = FormHandleToPageView(hHandle, page);
     if (!pPageView)
-        return FALSE;
+        return false;
 
     return pPageView->OnKeyUp(nKeyCode, modifier);
 }
@@ -132,7 +132,7 @@ DLLEXPORT FPDF_BOOL STDCALL FORM_OnChar(FPDF_FORMHANDLE hHandle, FPDF_PAGE page,
 {
     CPDFSDK_PageView* pPageView = FormHandleToPageView(hHandle, page);
     if (!pPageView)
-        return FALSE;
+        return false;
 
     return pPageView->OnChar(nChar, modifier);
 }
@@ -141,7 +141,7 @@ DLLEXPORT FPDF_BOOL STDCALL FORM_ForceToKillFocus(FPDF_FORMHANDLE hHandle)
 {
     CPDFSDK_Document* pSDKDoc = FormHandleToSDKDoc(hHandle);
     if (!pSDKDoc)
-        return FALSE;
+        return false;
 
     return pSDKDoc->KillFocusAnnot(0);
 }
@@ -216,7 +216,7 @@ DLLEXPORT void STDCALL FPDF_RemoveFormFieldHighlight(FPDF_FORMHANDLE hHandle)
 DLLEXPORT void STDCALL FORM_OnAfterLoadPage(FPDF_PAGE page, FPDF_FORMHANDLE hHandle)
 {
     if (CPDFSDK_PageView* pPageView = FormHandleToPageView(hHandle, page))
-        pPageView->SetValid(TRUE);
+        pPageView->SetValid(true);
 }
 
 DLLEXPORT void STDCALL FORM_OnBeforeClosePage(FPDF_PAGE page, FPDF_FORMHANDLE hHandle)
@@ -229,10 +229,10 @@ DLLEXPORT void STDCALL FORM_OnBeforeClosePage(FPDF_PAGE page, FPDF_FORMHANDLE hH
         return;
 
     CPDF_Page* pPage = (CPDF_Page*)page;
-    CPDFSDK_PageView* pPageView = pSDKDoc->GetPageView(pPage, FALSE);
+    CPDFSDK_PageView* pPageView = pSDKDoc->GetPageView(pPage, false);
     if (pPageView)
     {
-        pPageView->SetValid(FALSE);
+        pPageView->SetValid(false);
         // ReMovePageView() takes care of the delete for us.
         pSDKDoc->ReMovePageView(pPage);
     }
@@ -279,7 +279,7 @@ DLLEXPORT void STDCALL FORM_DoPageAAction(FPDF_PAGE page, FPDF_FORMHANDLE hHandl
         return;
     CPDFSDK_Document* pSDKDoc = ((CPDFDoc_Environment*)hHandle)->GetSDKDocument();
     CPDF_Page* pPage = (CPDF_Page*)page;
-    CPDFSDK_PageView* pPageView = pSDKDoc->GetPageView(pPage, FALSE);
+    CPDFSDK_PageView* pPageView = pSDKDoc->GetPageView(pPage, false);
     if(pPageView)
     {
         CPDFDoc_Environment *pEnv = pSDKDoc->GetEnv();
@@ -293,8 +293,8 @@ DLLEXPORT void STDCALL FORM_DoPageAAction(FPDF_PAGE page, FPDF_FORMHANDLE hHandl
 
         CPDF_AAction aa = pPageDict->GetDict(FX_BSTRC("AA"));
 
-        FX_BOOL bExistOAAction = FALSE;
-        FX_BOOL bExistCAAction = FALSE;
+        bool bExistOAAction = false;
+        bool bExistCAAction = false;
         if (FPDFPAGE_AACTION_OPEN == aaType)
         {
             bExistOAAction = aa.ActionExist(CPDF_AAction::OpenPage);
-- 
cgit v1.2.3