From 224bc5a983a02c0da3ecc0ee55b6c8b1fe500980 Mon Sep 17 00:00:00 2001
From: dsinclair <dsinclair@chromium.org>
Date: Thu, 28 Apr 2016 11:04:51 -0700
Subject: Change bool type to fix warnings.

Switching the Is{SHIFT|CTRL|ALT|}KeyDown methods to bool from FX_BOOL generated

cfx_systemhandler.cpp(129): warning C4800: 'FX_BOOL': forcing value to bool
'true' or 'false' (performance warning)

on the win_chromium_x64_rel_ng and win8_chromium_ng bots. This CL switches
back to FX_BOOL. Attempting to move everything to bool has huge ripple effects.

I removed IsINSERTKeyDown as it was always false.

Review-Url: https://codereview.chromium.org/1929963002
---
 fpdfsdk/cfx_systemhandler.cpp      | 10 +++-------
 fpdfsdk/cfx_systemhandler.h        |  1 -
 fpdfsdk/include/fsdk_mgr.h         |  2 --
 fpdfsdk/pdfwindow/PWL_EditCtrl.cpp |  2 --
 fpdfsdk/pdfwindow/PWL_Wnd.cpp      |  8 --------
 fpdfsdk/pdfwindow/PWL_Wnd.h        |  1 -
 6 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/fpdfsdk/cfx_systemhandler.cpp b/fpdfsdk/cfx_systemhandler.cpp
index 95a940d1ff..c5f53341e1 100644
--- a/fpdfsdk/cfx_systemhandler.cpp
+++ b/fpdfsdk/cfx_systemhandler.cpp
@@ -126,17 +126,13 @@ FX_SYSTEMTIME CFX_SystemHandler::GetLocalTime() {
 }
 
 bool CFX_SystemHandler::IsSHIFTKeyDown(uint32_t nFlag) const {
-  return m_pEnv->FFI_IsSHIFTKeyDown(nFlag);
+  return !!m_pEnv->FFI_IsSHIFTKeyDown(nFlag);
 }
 
 bool CFX_SystemHandler::IsCTRLKeyDown(uint32_t nFlag) const {
-  return m_pEnv->FFI_IsCTRLKeyDown(nFlag);
+  return !!m_pEnv->FFI_IsCTRLKeyDown(nFlag);
 }
 
 bool CFX_SystemHandler::IsALTKeyDown(uint32_t nFlag) const {
-  return m_pEnv->FFI_IsALTKeyDown(nFlag);
-}
-
-bool CFX_SystemHandler::IsINSERTKeyDown(uint32_t nFlag) const {
-  return m_pEnv->FFI_IsINSERTKeyDown(nFlag);
+  return !!m_pEnv->FFI_IsALTKeyDown(nFlag);
 }
diff --git a/fpdfsdk/cfx_systemhandler.h b/fpdfsdk/cfx_systemhandler.h
index ec5735366c..e77120adef 100644
--- a/fpdfsdk/cfx_systemhandler.h
+++ b/fpdfsdk/cfx_systemhandler.h
@@ -68,7 +68,6 @@ class CFX_SystemHandler {
   bool IsSHIFTKeyDown(uint32_t nFlag) const;
   bool IsCTRLKeyDown(uint32_t nFlag) const;
   bool IsALTKeyDown(uint32_t nFlag) const;
-  bool IsINSERTKeyDown(uint32_t nFlag) const;
 
   FX_SYSTEMTIME GetLocalTime();
 
diff --git a/fpdfsdk/include/fsdk_mgr.h b/fpdfsdk/include/fsdk_mgr.h
index 8fbc0d75e9..cd89a925ab 100644
--- a/fpdfsdk/include/fsdk_mgr.h
+++ b/fpdfsdk/include/fsdk_mgr.h
@@ -115,8 +115,6 @@ class CPDFDoc_Environment final {
     return (nFlag & FWL_EVENTFLAG_AltKey) != 0;
   }
 
-  FX_BOOL FFI_IsINSERTKeyDown(uint32_t nFlag) const { return FALSE; }
-
   FPDF_PAGE FFI_GetPage(FPDF_DOCUMENT document, int nPageIndex) {
     if (m_pInfo && m_pInfo->FFI_GetPage)
       return m_pInfo->FFI_GetPage(m_pInfo, document, nPageIndex);
diff --git a/fpdfsdk/pdfwindow/PWL_EditCtrl.cpp b/fpdfsdk/pdfwindow/PWL_EditCtrl.cpp
index a6596582de..23349b46bc 100644
--- a/fpdfsdk/pdfwindow/PWL_EditCtrl.cpp
+++ b/fpdfsdk/pdfwindow/PWL_EditCtrl.cpp
@@ -284,8 +284,6 @@ FX_BOOL CPWL_EditCtrl::OnChar(uint16_t nChar, uint32_t nFlag) {
     case FWL_VKEY_Unknown:
       break;
     default:
-      if (IsINSERTpressed(nFlag))
-        Delete();
       InsertWord(word, GetCharSet());
       break;
   }
diff --git a/fpdfsdk/pdfwindow/PWL_Wnd.cpp b/fpdfsdk/pdfwindow/PWL_Wnd.cpp
index 8883ceb574..bb424ffa43 100644
--- a/fpdfsdk/pdfwindow/PWL_Wnd.cpp
+++ b/fpdfsdk/pdfwindow/PWL_Wnd.cpp
@@ -1029,11 +1029,3 @@ FX_BOOL CPWL_Wnd::IsALTpressed(uint32_t nFlag) const {
 
   return FALSE;
 }
-
-FX_BOOL CPWL_Wnd::IsINSERTpressed(uint32_t nFlag) const {
-  if (CFX_SystemHandler* pSystemHandler = GetSystemHandler()) {
-    return pSystemHandler->IsINSERTKeyDown(nFlag);
-  }
-
-  return FALSE;
-}
diff --git a/fpdfsdk/pdfwindow/PWL_Wnd.h b/fpdfsdk/pdfwindow/PWL_Wnd.h
index dec3f9f252..319e6da9a4 100644
--- a/fpdfsdk/pdfwindow/PWL_Wnd.h
+++ b/fpdfsdk/pdfwindow/PWL_Wnd.h
@@ -425,7 +425,6 @@ class CPWL_Wnd : public CPWL_TimerHandler {
   FX_BOOL IsCTRLpressed(uint32_t nFlag) const;
   FX_BOOL IsSHIFTpressed(uint32_t nFlag) const;
   FX_BOOL IsALTpressed(uint32_t nFlag) const;
-  FX_BOOL IsINSERTpressed(uint32_t nFlag) const;
 
  private:
   void AddChild(CPWL_Wnd* pWnd);
-- 
cgit v1.2.3