diff options
author | weili <weili@chromium.org> | 2016-06-18 06:21:57 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-06-18 06:21:57 -0700 |
commit | 4ce94e118d66064715de5baebeb4b2b580dcac66 (patch) | |
tree | ba74181eb90675172d3c7f4be8e71ada3fbc9125 /xfa/fwl/core/fwl_formimp.h | |
parent | 2fad11a8d9d2704cd9ee28b02373ad7ce19c65e3 (diff) | |
download | pdfium-4ce94e118d66064715de5baebeb4b2b580dcac66.tar.xz |
Make code compile with clang_use_chrome_plugin (part VI)
This change mainly contains files in xfa/fwl directory.
This is part of the efforts to make PDFium code compilable
by Clang chromium style plugins.
The changes are mainly the following:
-- move inline constructor/destructor of complex class/struct out-of-line;
-- add constructor/destructor of complex class/struct if not
explicitly defined;
-- add explicit out-of-line copy constructor when needed;
-- move inline virtual functions out-of-line;
-- Properly mark virtual functions with 'override';
-- some minor cleanups;
BUG=pdfium:469
Review-Url: https://codereview.chromium.org/2070583003
Diffstat (limited to 'xfa/fwl/core/fwl_formimp.h')
-rw-r--r-- | xfa/fwl/core/fwl_formimp.h | 41 |
1 files changed, 12 insertions, 29 deletions
diff --git a/xfa/fwl/core/fwl_formimp.h b/xfa/fwl/core/fwl_formimp.h index 1f2d6951c0..7278afb681 100644 --- a/xfa/fwl/core/fwl_formimp.h +++ b/xfa/fwl/core/fwl_formimp.h @@ -27,35 +27,15 @@ class CFWL_FormImpDelegate; class CFWL_SysBtn { public: - CFWL_SysBtn() { - m_rtBtn.Set(0, 0, 0, 0); - m_dwState = 0; - } - - bool IsDisabled() { return !!(m_dwState & FWL_SYSBUTTONSTATE_Disabled); } - - void SetNormal() { m_dwState &= 0xFFF0; } - void SetPressed() { - SetNormal(); - m_dwState |= FWL_SYSBUTTONSTATE_Pressed; - } - void SetHover() { - SetNormal(); - m_dwState |= FWL_SYSBUTTONSTATE_Hover; - } - void SetDisabled(FX_BOOL bDisabled) { - bDisabled ? m_dwState |= FWL_SYSBUTTONSTATE_Disabled - : m_dwState &= ~FWL_SYSBUTTONSTATE_Disabled; - } - uint32_t GetPartState() { - if (IsDisabled()) - return CFWL_PartState_Disabled; - if (m_dwState & FWL_SYSBUTTONSTATE_Pressed) - return CFWL_PartState_Pressed; - if (m_dwState & FWL_SYSBUTTONSTATE_Hover) - return CFWL_PartState_Hovered; - return CFWL_PartState_Normal; - } + CFWL_SysBtn(); + + bool IsDisabled() const; + uint32_t GetPartState() const; + + void SetNormal(); + void SetPressed(); + void SetHover(); + void SetDisabled(FX_BOOL bDisabled); CFX_RectF m_rtBtn; uint32_t m_dwState; @@ -67,6 +47,9 @@ enum FORM_RESIZETYPE { }; typedef struct RestoreResizeInfo { + RestoreResizeInfo(); + ~RestoreResizeInfo(); + CFX_PointF m_ptStart; CFX_SizeF m_szStart; } RestoreInfo; |