XFA: merge patch from issue 726033002

core/src/fxge/android/fpf_skiafontmgr.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 "fx_fpf.h"
 #if _FX_OS_ == _FX_ANDROID_
 #define FPF_SKIAMATCHWEIGHT_NAME1       62
 #define FPF_SKIAMATCHWEIGHT_NAME2       60
@@ skipping 59 matching lines @@
         FX_INT32 iMid = (iStart + iEnd) / 2;
         FPF_LPCSKIAFONTMAP pItem = &g_SkiaFontmap[iMid];
         if (dwHash < pItem->dwFamily) {
             iEnd = iMid - 1;
         } else if (dwHash > pItem->dwFamily) {
             iStart = iMid + 1;
         } else {
             return pItem->dwSubSt;
         }
     }
-    return NULL;
+    return 0;
 }
 static const FPF_SKIAFONTMAP g_SkiaSansFontMap[] = {
     {0x58c5083,         0xd5b8d10f},
     {0x14ee2d13,        0xd5b8d10f},
     {0x779ce19d,        0xd5b8d10f},
     {0xcb7a04c8,        0xd5b8d10f},
     {0xfb4ce0de,        0xd5b8d10f},
 };
 FX_DWORD FPF_SkiaGetSansFont(FX_DWORD dwHash)
 {
@@ skipping 461 matching lines @@
         pFontDesc->m_dwStyle |= FXFONT_SYMBOLIC;
     }
     pFontDesc->m_dwCharsets = FPF_SkiaGetFaceCharset(pOS2);
     pFontDesc->m_iFaceIndex = face->face_index;
     pFontDesc->m_iGlyphNum = face->num_glyphs;
 }
 void CFPF_SkiaFontMgr::OutputSystemFonts()
 {
 }
 #endif