Merge to XFA: FX_BOOL combo patch.

core/src/fxge/ge/text_int.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_SRC_FXGE_GE_TEXT_INT_H_
 #define CORE_SRC_FXGE_GE_TEXT_INT_H_
 
 struct _CFX_UniqueKeyGen {
@@ skipping 14 matching lines @@
 class CTTFontDesc
 {
 public:
     CTTFontDesc()
     {
         m_Type = 0;
         m_pFontData = NULL;
         m_RefCount = 0;
     }
     ~CTTFontDesc();
-    FX_BOOL                     ReleaseFace(FXFT_Face face);
+    int32_t                     ReleaseFace(FXFT_Face face);
     int                         m_Type;
     union {
         struct {
             FX_BOOL             m_bItalic;
             FX_BOOL             m_bBold;
             FXFT_Face   m_pFace;
         } m_SingleFace;
         struct {
             FXFT_Face   m_pFaces[16];
         } m_TTCFace;
@@ skipping 70 matching lines @@
     virtual FX_DWORD            GlyphFromCharCodeEx(FX_DWORD charcode, int encoding = ENCODING_UNICODE)
     {
         return GlyphFromCharCode(charcode);
     }
 private:
     CFX_Font* m_pFont;
     FX_DWORD m_nEncodingID;
 };
 
 #endif  // CORE_SRC_FXGE_GE_TEXT_INT_H_