diff options
| author | dsinclair <dsinclair@chromium.org> | 2016-04-28 11:04:51 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-04-28 11:04:51 -0700 |
| commit | 224bc5a983a02c0da3ecc0ee55b6c8b1fe500980 (patch) | |
| tree | b6f16086e39be43f5afdb9457886288737c7272b /fpdfsdk/pdfwindow | |
| parent | 7322343b9322b93d97077575f95a00dcca3f0451 (diff) | |
| download | pdfium-224bc5a983a02c0da3ecc0ee55b6c8b1fe500980.tar.xz | |
Change bool type to fix warnings.chromium/2720
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
Diffstat (limited to 'fpdfsdk/pdfwindow')
| -rw-r--r-- | fpdfsdk/pdfwindow/PWL_EditCtrl.cpp | 2 | ||||
| -rw-r--r-- | fpdfsdk/pdfwindow/PWL_Wnd.cpp | 8 | ||||
| -rw-r--r-- | fpdfsdk/pdfwindow/PWL_Wnd.h | 1 |
3 files changed, 0 insertions, 11 deletions
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); |