diff options
| author | Lei Zhang <thestig@chromium.org> | 2017-07-21 17:42:19 -0700 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-07-22 00:54:57 +0000 |
| commit | 60fa2fce1f6fc02b3039166d84ed8ec152312566 (patch) | |
| tree | a5fe7c1263ccb1620b16b549787e390bb1814dd4 /fpdfsdk/pdfwindow/cpwl_wnd.h | |
| parent | d2be646ae1655ac702c5f304d546a2eb32ad2c54 (diff) | |
| download | pdfium-60fa2fce1f6fc02b3039166d84ed8ec152312566.tar.xz | |
Simplify code in CPDFSDK_FormFillEnvironment.chromium/3165
This makes various IsFooKeyDown() methods static.
Transitively apply that to callers too.
Change-Id: Ia43b1fd62889c1943e0d8407e9696225b05125a8
Reviewed-on: https://pdfium-review.googlesource.com/7190
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: dsinclair <dsinclair@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'fpdfsdk/pdfwindow/cpwl_wnd.h')
| -rw-r--r-- | fpdfsdk/pdfwindow/cpwl_wnd.h | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/fpdfsdk/pdfwindow/cpwl_wnd.h b/fpdfsdk/pdfwindow/cpwl_wnd.h index 56fbb21baa..b22c5dba21 100644 --- a/fpdfsdk/pdfwindow/cpwl_wnd.h +++ b/fpdfsdk/pdfwindow/cpwl_wnd.h @@ -15,6 +15,7 @@ #include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/fx_basic.h" #include "core/fxge/cfx_color.h" +#include "fpdfsdk/cpdfsdk_formfillenvironment.h" #include "fpdfsdk/cpdfsdk_widget.h" #include "fpdfsdk/pdfwindow/cpwl_timer.h" #include "fpdfsdk/pdfwindow/cpwl_timer_handler.h" @@ -298,9 +299,15 @@ class CPWL_Wnd : public CPWL_TimerHandler, public CFX_Observable<CPWL_Wnd> { bool IsWndCaptureKeyboard(const CPWL_Wnd* pWnd) const; const CPWL_Wnd* GetRootWnd() const; - bool IsCTRLpressed(uint32_t nFlag) const; - bool IsSHIFTpressed(uint32_t nFlag) const; - bool IsALTpressed(uint32_t nFlag) const; + static bool IsCTRLpressed(uint32_t nFlag) { + return CPDFSDK_FormFillEnvironment::IsCTRLKeyDown(nFlag); + } + static bool IsSHIFTpressed(uint32_t nFlag) { + return CPDFSDK_FormFillEnvironment::IsSHIFTKeyDown(nFlag); + } + static bool IsALTpressed(uint32_t nFlag) { + return CPDFSDK_FormFillEnvironment::IsALTKeyDown(nFlag); + } private: CFX_PointF ParentToChild(const CFX_PointF& point) const; |