Merge to XFA: Sanity check the values of TRUE and FALSE.

core/include/fxge/fx_dib.h

 // 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
 
 #ifndef CORE_INCLUDE_FXGE_FX_DIB_H_
 #define CORE_INCLUDE_FXGE_FX_DIB_H_
 
 #include "../fxcrt/fx_basic.h"
@@ skipping 178 matching lines @@
                                   int dest_bpp,
                                   int dest_width,
                                   FX_BOOL bFlipX,
                                   int clip_left,
                                   int clip_width) const = 0;
 
   virtual void SetDownSampleSize(int width, int height) const {}
 
   int GetBPP() const { return m_bpp; }
 
+  // TODO(thestig): Investigate this. Given the possible values of FXDIB_Format,
+  // it feels as though this should be implemented as !!(m_AlphaFlag & 1) and
+  // IsOpaqueImage() below should never be able to return TRUE.
   FX_BOOL IsAlphaMask() const { return m_AlphaFlag == 1; }
 
-  FX_BOOL HasAlpha() const { return m_AlphaFlag & 2 ? TRUE : FALSE; }
+  FX_BOOL HasAlpha() const { return !!(m_AlphaFlag & 2); }
 
   FX_BOOL IsOpaqueImage() const { return !(m_AlphaFlag & 3); }
 
-  FX_BOOL IsCmykImage() const { return m_AlphaFlag & 4 ? TRUE : FALSE; }
+  FX_BOOL IsCmykImage() const { return !!(m_AlphaFlag & 4); }
 
   int GetPaletteSize() const {
     return IsAlphaMask() ? 0 : (m_bpp == 1 ? 2 : (m_bpp == 8 ? 256 : 0));
   }
 
   FX_DWORD GetPaletteEntry(int index) const;
 
   void SetPaletteEntry(int index, FX_DWORD color);
   FX_DWORD GetPaletteArgb(int index) const { return GetPaletteEntry(index); }
   void SetPaletteArgb(int index, FX_DWORD color) {
@@ skipping 469 matching lines @@
   int m_Status;
   FX_RECT m_ClipBox;
   FX_DWORD m_Flags;
   int m_AlphaFlag;
   void* m_pIccTransform;
   FX_BOOL m_bRgbByteOrder;
   int m_BlendType;
 };
 
 #endif  // CORE_INCLUDE_FXGE_FX_DIB_H_