From bbff41927ecce2ff93668aa615307f548ca896eb Mon Sep 17 00:00:00 2001 From: weili Date: Fri, 27 May 2016 14:48:10 -0700 Subject: Fix two bugs found by /analyze tool The first one is about bitwise AND on zero, the result would always be zero. The second one is about using wrong bitmasks, the result would cause branches never get executed. BUG=chromium:613623, chromium:427616 Review-Url: https://codereview.chromium.org/2016243003 --- xfa/fwl/theme/cfwl_formtp.cpp | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) (limited to 'xfa/fwl/theme/cfwl_formtp.cpp') diff --git a/xfa/fwl/theme/cfwl_formtp.cpp b/xfa/fwl/theme/cfwl_formtp.cpp index 971e738765..033375911b 100644 --- a/xfa/fwl/theme/cfwl_formtp.cpp +++ b/xfa/fwl/theme/cfwl_formtp.cpp @@ -78,25 +78,17 @@ FX_BOOL CFWL_FormTP::DrawBackground(CFWL_ThemeBackground* pParams) { if (!pParams) return FALSE; int32_t iActive = 0; - if (pParams->m_dwStates & CFWL_PartState_Inactive) { + if (pParams->m_dwStates & CFWL_PartState_Inactive) iActive = 1; - } + FWLTHEME_STATE eState = FWLTHEME_STATE_Normal; - switch (pParams->m_dwStates & 0x03) { - case CFWL_PartState_Hovered: { - eState = FWLTHEME_STATE_Hover; - break; - } - case CFWL_PartState_Pressed: { - eState = FWLTHEME_STATE_Pressed; - break; - } - case CFWL_PartState_Disabled: { - eState = FWLTHEME_STATE_Disabale; - break; - } - default: {} - } + if (pParams->m_dwStates & CFWL_PartState_Hovered) + eState = FWLTHEME_STATE_Hover; + else if (pParams->m_dwStates & CFWL_PartState_Pressed) + eState = FWLTHEME_STATE_Pressed; + else if (pParams->m_dwStates & CFWL_PartState_Disabled) + eState = FWLTHEME_STATE_Disabale; + switch (pParams->m_iPart) { case CFWL_Part::Border: { DrawFormBorder(pParams->m_pGraphics, &pParams->m_rtPart, eState, -- cgit v1.2.3