Return bool rather than bitwise-and for FX_BOOL

xfa/fxfa/app/xfa_ffwidget.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "xfa/fxfa/include/xfa_ffwidget.h"
 
 #include <algorithm>
 
@@ skipping 154 matching lines @@
   m_pDocView->AddInvalidateRect(m_pPageView, rtWidget);
 }
 FX_BOOL CXFA_FFWidget::GetCaptionText(CFX_WideString& wsCap) {
   CXFA_TextLayout* pCapTextlayout = m_pDataAcc->GetCaptionTextLayout();
   if (!pCapTextlayout) {
     return FALSE;
   }
   pCapTextlayout->GetText(wsCap);
   return TRUE;
 }
 FX_BOOL CXFA_FFWidget::IsFocused() {

[dsinclair, 2016/05/04 13:11:51]

nit: Can these return bool (possibly in a followup?)

[Tom Sepez, 2016/05/04 20:21:26]

This one yes, the others have overrides .

-  return m_dwStatus & XFA_WIDGETSTATUS_Focused;
+  return !!(m_dwStatus & XFA_WIDGETSTATUS_Focused);
 }
 FX_BOOL CXFA_FFWidget::OnMouseEnter() {
   return FALSE;
 }
 FX_BOOL CXFA_FFWidget::OnMouseExit() {
   return FALSE;
 }
 FX_BOOL CXFA_FFWidget::OnLButtonDown(uint32_t dwFlags,
                                      FX_FLOAT fx,
                                      FX_FLOAT fy) {
@@ skipping 206 matching lines @@
 void CXFA_FFWidget::GetMinMaxHeight(FX_FLOAT fMinHeight, FX_FLOAT fMaxHeight) {
   fMinHeight = fMaxHeight = 0;
   FX_FLOAT fHeight = 0;
   if (m_pDataAcc->GetHeight(fHeight)) {
     fMinHeight = fMaxHeight = fHeight;
   } else {
     m_pDataAcc->GetMinHeight(fMinHeight);
     m_pDataAcc->GetMaxHeight(fMaxHeight);
   }
 }
 FX_BOOL CXFA_FFWidget::IsMatchVisibleStatus(uint32_t dwStatus) {

[dsinclair, 2016/05/04 13:11:51]

nit: bool?

[Tom Sepez, 2016/05/04 20:21:26]

Done.

-  return m_dwStatus & XFA_WIDGETSTATUS_Visible;
+  return !!(m_dwStatus & XFA_WIDGETSTATUS_Visible);
 }
 void CXFA_FFWidget::EventKillFocus() {
   if (m_dwStatus & XFA_WIDGETSTATUS_Access) {
     m_dwStatus &= ~XFA_WIDGETSTATUS_Access;
     return;
   }
   CXFA_EventParam eParam;
   eParam.m_eType = XFA_EVENT_Exit;
   eParam.m_pTarget = m_pDataAcc;
   m_pDataAcc->ProcessEvent(XFA_ATTRIBUTEENUM_Exit, &eParam);
@@ skipping 249 matching lines @@
 void CXFA_ImageRenderer::CompositeDIBitmap(CFX_DIBitmap* pDIBitmap,
                                            int left,
                                            int top,
                                            FX_ARGB mask_argb,
                                            int bitmap_alpha,
                                            int blend_mode,
                                            int Transparency) {
   if (pDIBitmap == NULL) {
     return;
   }
-  FX_BOOL bIsolated = Transparency & PDFTRANS_ISOLATED;
-  FX_BOOL bGroup = Transparency & PDFTRANS_GROUP;
+  bool bIsolated = !!(Transparency & PDFTRANS_ISOLATED);
+  bool bGroup = !!(Transparency & PDFTRANS_GROUP);
   if (blend_mode == FXDIB_BLEND_NORMAL) {
     if (!pDIBitmap->IsAlphaMask()) {
       if (bitmap_alpha < 255) {
         pDIBitmap->MultiplyAlpha(bitmap_alpha);
       }
       if (m_pDevice->SetDIBits(pDIBitmap, left, top)) {
         return;
       }
     } else {
       uint32_t fill_argb = (mask_argb);
@@ skipping 1269 matching lines @@
       iType != XFA_ELEMENT_Rectangle) {
     return;
   }
   CXFA_StrokeArray strokes;
   if (!(dwFlags & XFA_DRAWBOX_ForceRound) && iType != XFA_ELEMENT_Arc) {
     box.GetStrokes(strokes);
   }
   XFA_BOX_Fill(box, strokes, pGS, rtWidget, pMatrix, dwFlags);
   XFA_BOX_Stroke(box, strokes, pGS, rtWidget, pMatrix, dwFlags);
 }