Merge to XFA: Get rid of most instance of 'foo == NULL'

core/src/fxge/ge/fx_ge_fontmap.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 <limits>
 
 #include "core/include/fxge/fx_freetype.h"
 #include "core/include/fxge/fx_ge.h"
@@ skipping 297 matching lines @@
       fontName = "FrenchScriptMT";
     } else if (fontName.Find("FreeStyle") >= 0) {
       fontName = "FreeStyleScript";
     }
     return fontName;
   }
   AltFontFamily* found = (AltFontFamily*)FXSYS_bsearch(
       fontName.c_str(), g_AltFontFamilies,
       sizeof g_AltFontFamilies / sizeof(AltFontFamily), sizeof(AltFontFamily),
       CompareFontFamilyString);
-  if (found == NULL) {
-    return fontName;
-  }
-  return found->m_pFontFamily;
+  return found ? CFX_ByteString(found->m_pFontFamily) : fontName;
 }
 
 CFX_ByteString ParseStyle(const FX_CHAR* pStyle, int iLen, int iIndex) {
   CFX_ByteTextBuf buf;
   if (!iLen || iLen <= iIndex) {
     return buf.GetByteString();
   }
   while (iIndex < iLen) {
     if (pStyle[iIndex] == ',') {
       break;
@@ skipping 340 matching lines @@
     FXFT_Done_Face(m_MMFaces[0]);
   }
   if (m_MMFaces[1]) {
     FXFT_Done_Face(m_MMFaces[1]);
   }
   if (m_pFontInfo) {
     m_pFontInfo->Release();
   }
 }
 void CFX_FontMapper::SetSystemFontInfo(IFX_SystemFontInfo* pFontInfo) {
-  if (pFontInfo == NULL) {
+  if (!pFontInfo) {
     return;
   }
   if (m_pFontInfo) {
     m_pFontInfo->Release();
   }
   m_pFontInfo = pFontInfo;
 }
 
 CFX_ByteString GetNameFromTT(const uint8_t* name_table, FX_DWORD name_id) {
   const uint8_t* ptr = name_table + 2;
@@ skipping 21 matching lines @@
     return CFX_ByteString();
 
   std::vector<uint8_t> buffer(size);
   uint8_t* buffer_ptr = pdfium::vector_as_array(&buffer);
   FX_DWORD bytes_read =
       m_pFontInfo->GetFontData(hFont, kTableNAME, buffer_ptr, size);
   return (bytes_read == size) ? GetNameFromTT(buffer_ptr, 6) : CFX_ByteString();
 }
 
 void CFX_FontMapper::AddInstalledFont(const CFX_ByteString& name, int charset) {
-  if (m_pFontInfo == NULL) {
+  if (!m_pFontInfo) {
     return;
   }
   if (m_CharsetArray.Find((FX_DWORD)charset) == -1) {
     m_CharsetArray.Add((FX_DWORD)charset);
     m_FaceArray.Add(name);
   }
   if (name == m_LastFamily) {
     return;
   }
   const uint8_t* ptr = name;
   FX_BOOL bLocalized = FALSE;
   for (int i = 0; i < name.GetLength(); i++)
     if (ptr[i] > 0x80) {
       bLocalized = TRUE;
       break;
     }
   if (bLocalized) {
     void* hFont = m_pFontInfo->GetFont(name);
-    if (hFont == NULL) {
+    if (!hFont) {
       int iExact;
       hFont =
           m_pFontInfo->MapFont(0, 0, FXFONT_DEFAULT_CHARSET, 0, name, iExact);
-      if (hFont == NULL) {
+      if (!hFont) {
         return;
       }
     }
     CFX_ByteString new_name = GetPSNameFromTT(hFont);
     if (!new_name.IsEmpty()) {
       new_name.Insert(0, ' ');
       m_InstalledTTFonts.Add(new_name);
     }
     m_pFontInfo->DeleteFont(hFont);
   }
   m_InstalledTTFonts.Add(name);
   m_LastFamily = name;
 }
 void CFX_FontMapper::LoadInstalledFonts() {
-  if (m_pFontInfo == NULL) {
+  if (!m_pFontInfo) {
     return;
   }
   if (m_bListLoaded) {
     return;
   }
   if (m_bListLoaded) {
     return;
   }
   m_pFontInfo->EnumFontList(this);
   m_bListLoaded = TRUE;
@@ skipping 239 matching lines @@
   if (WindowCP) {
     Charset = GetCharsetFromCodePage(WindowCP);
   } else if (iBaseFont == 12 && (flags & FXFONT_SYMBOLIC)) {
     Charset = FXFONT_SYMBOL_CHARSET;
   }
   if (Charset == FXFONT_SHIFTJIS_CHARSET || Charset == FXFONT_GB2312_CHARSET ||
       Charset == FXFONT_HANGEUL_CHARSET ||
       Charset == FXFONT_CHINESEBIG5_CHARSET) {
     bCJK = TRUE;
   }
-  if (m_pFontInfo == NULL) {
+  if (!m_pFontInfo) {
     pSubstFont->m_SubstFlags |= FXFONT_SUBST_STANDARD;
     return UseInternalSubst(pSubstFont, iBaseFont, italic_angle, old_weight,
                             PitchFamily);
   }
   family = GetFontFamily(family, nStyle);
   CFX_ByteString match = MatchInstalledFonts(TT_NormalizeName(family));
   if (match.IsEmpty() && family != SubstName &&
       (!bHasComma && (!bHasHypen || (bHasHypen && !bStyleAvail)))) {
     match = MatchInstalledFonts(TT_NormalizeName(SubstName));
   }
@@ skipping 48 matching lines @@
     if (flags & FXFONT_ITALIC) {
       bItalic = TRUE;
     }
   }
   iExact = !match.IsEmpty();
   void* hFont = m_pFontInfo->MapFont(weight, bItalic, Charset, PitchFamily,
                                      family, iExact);
   if (iExact) {
     pSubstFont->m_SubstFlags |= FXFONT_SUBST_EXACT;
   }
-  if (hFont == NULL) {
+  if (!hFont) {

[Lei Zhang, 2015/12/15 02:31:56]

Conflicted here.

 #ifdef PDF_ENABLE_XFA
     if (flags & FXFONT_EXACTMATCH) {
       return NULL;
     }
 #endif  // PDF_ENABLE_XFA
     if (bCJK) {
       if (italic_angle != 0) {
         bItalic = TRUE;
       } else {
         bItalic = FALSE;
       }
       weight = old_weight;
     }
     if (!match.IsEmpty()) {
       hFont = m_pFontInfo->GetFont(match);
-      if (hFont == NULL) {
+      if (!hFont) {
         return UseInternalSubst(pSubstFont, iBaseFont, italic_angle, old_weight,
                                 PitchFamily);
       }
     } else {
       if (Charset == FXFONT_SYMBOL_CHARSET) {
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ || \
     _FXM_PLATFORM_ == _FXM_PLATFORM_ANDROID_
         if (SubstName == "Symbol") {
           pSubstFont->m_Family = "Chrome Symbol";
           pSubstFont->m_SubstFlags |= FXFONT_SUBST_STANDARD;
@@ skipping 43 matching lines @@
   if (ttc_size) {
     uint8_t temp[1024];
     m_pFontInfo->GetFontData(hFont, kTableTTCF, temp, 1024);
     FX_DWORD checksum = 0;
     for (int i = 0; i < 256; i++) {
       checksum += ((FX_DWORD*)temp)[i];
     }
     uint8_t* pFontData;
     face = m_pFontMgr->GetCachedTTCFace(ttc_size, checksum,
                                         ttc_size - font_size, pFontData);
-    if (face == NULL) {
+    if (!face) {
       pFontData = FX_Alloc(uint8_t, ttc_size);
       m_pFontInfo->GetFontData(hFont, kTableTTCF, pFontData, ttc_size);
       face = m_pFontMgr->AddCachedTTCFace(ttc_size, checksum, pFontData,
                                           ttc_size, ttc_size - font_size);
     }
   } else {
     uint8_t* pFontData;
     face = m_pFontMgr->GetCachedFace(SubstName, weight, bItalic, pFontData);
-    if (face == NULL) {
+    if (!face) {
       pFontData = FX_Alloc(uint8_t, font_size);
       m_pFontInfo->GetFontData(hFont, 0, pFontData, font_size);
       face = m_pFontMgr->AddCachedFace(SubstName, weight, bItalic, pFontData,
                                        font_size,
                                        m_pFontInfo->GetFaceIndex(hFont));
     }
   }
-  if (face == NULL) {
+  if (!face) {
     m_pFontInfo->DeleteFont(hFont);
     return NULL;
   }
   pSubstFont->m_Family = SubstName;
   pSubstFont->m_Charset = Charset;
   FX_BOOL bNeedUpdateWeight = FALSE;
   if (FXFT_Is_Face_Bold(face)) {
     if (weight == FXFONT_FW_BOLD) {
       bNeedUpdateWeight = FALSE;
     } else {
@@ skipping 131 matching lines @@
 }
 FX_BOOL CFX_FolderFontInfo::EnumFontList(CFX_FontMapper* pMapper) {
   m_pMapper = pMapper;
   for (int i = 0; i < m_PathList.GetSize(); i++) {
     ScanPath(m_PathList[i]);
   }
   return TRUE;
 }
 void CFX_FolderFontInfo::ScanPath(CFX_ByteString& path) {
   void* handle = FX_OpenFolder(path);
-  if (handle == NULL) {
+  if (!handle) {
     return;
   }
   CFX_ByteString filename;
   FX_BOOL bFolder;
   while (FX_GetNextFile(handle, filename, bFolder)) {
     if (bFolder) {
       if (filename == "." || filename == "..") {
         continue;
       }
     } else {
@@ skipping 13 matching lines @@
     if (bFolder) {
       ScanPath(fullpath);
     } else {
       ScanFile(fullpath);
     }
   }
   FX_CloseFolder(handle);
 }
 void CFX_FolderFontInfo::ScanFile(CFX_ByteString& path) {
   FXSYS_FILE* pFile = FXSYS_fopen(path, "rb");
-  if (pFile == NULL) {
+  if (!pFile) {
     return;
   }
   FXSYS_fseek(pFile, 0, FXSYS_SEEK_END);
   FX_DWORD filesize = FXSYS_ftell(pFile);
   uint8_t buffer[16];
   FXSYS_fseek(pFile, 0, FXSYS_SEEK_SET);
   size_t readCnt = FXSYS_fread(buffer, 12, 1, pFile);
   if (readCnt != 1) {
     FXSYS_fclose(pFile);
     return;
@@ skipping 190 matching lines @@
   if (FXSYS_fseek(pFile, offset, FXSYS_SEEK_SET) < 0 ||
       FXSYS_fread(buffer, datasize, 1, pFile) != 1) {
     datasize = 0;
   }
   FXSYS_fclose(pFile);
   return datasize;
 }
 
 void CFX_FolderFontInfo::DeleteFont(void* hFont) {}
 FX_BOOL CFX_FolderFontInfo::GetFaceName(void* hFont, CFX_ByteString& name) {
-  if (hFont == NULL) {
+  if (!hFont) {
     return FALSE;
   }
   CFX_FontFaceInfo* pFont = (CFX_FontFaceInfo*)hFont;
   name = pFont->m_FaceName;
   return TRUE;
 }
 FX_BOOL CFX_FolderFontInfo::GetFontCharset(void* hFont, int& charset) {
   return FALSE;
 }
 
 int PDF_GetStandardFontName(CFX_ByteString* name) {
   AltFontName* found = static_cast<AltFontName*>(
       FXSYS_bsearch(name->c_str(), g_AltFontNames, FX_ArraySize(g_AltFontNames),
                     sizeof(AltFontName), CompareString));
   if (!found)
     return -1;
 
   *name = g_Base14FontNames[found->m_Index];
   return found->m_Index;
 }