From 224bc5a983a02c0da3ecc0ee55b6c8b1fe500980 Mon Sep 17 00:00:00 2001 From: dsinclair 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 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'fpdfsdk/cfx_systemhandler.cpp') 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); } -- cgit v1.2.3