Reland "Fix chromium-style errors."

core/include/fxge/fx_font.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_FONT_H_
 #define CORE_INCLUDE_FXGE_FX_FONT_H_
 
 #include <map>
@@ skipping 347 matching lines @@
   static IFX_SystemFontInfo* CreateDefault(const char** pUserPaths);
   virtual void Release() = 0;
 
   virtual FX_BOOL EnumFontList(CFX_FontMapper* pMapper) = 0;
   virtual void* MapFont(int weight,
                         FX_BOOL bItalic,
                         int charset,
                         int pitch_family,
                         const FX_CHAR* face,
                         int& iExact) = 0;
+
 #ifdef PDF_ENABLE_XFA
   virtual void* MapFontByUnicode(FX_DWORD dwUnicode,
                                  int weight,
                                  FX_BOOL bItalic,
-                                 int pitch_family) {
-    return NULL;
-  }
+                                 int pitch_family);
 #endif  // PDF_ENABLE_XFA
+
   virtual void* GetFont(const FX_CHAR* face) = 0;
   virtual FX_DWORD GetFontData(void* hFont,
                                FX_DWORD table,
                                uint8_t* buffer,
                                FX_DWORD size) = 0;
   virtual FX_BOOL GetFaceName(void* hFont, CFX_ByteString& name) = 0;
   virtual FX_BOOL GetFontCharset(void* hFont, int& charset) = 0;
-  virtual int GetFaceIndex(void* hFont) { return 0; }
+  virtual int GetFaceIndex(void* hFont);
   virtual void DeleteFont(void* hFont) = 0;
-  virtual void* RetainFont(void* hFont) { return NULL; }
+  virtual void* RetainFont(void* hFont);
 
  protected:
   virtual ~IFX_SystemFontInfo() {}
 };
 
 class CFX_FolderFontInfo : public IFX_SystemFontInfo {
  public:
   CFX_FolderFontInfo();
   ~CFX_FolderFontInfo() override;
   void AddPath(const CFX_ByteStringC& path);
@@ skipping 43 matching lines @@
 };
 
 class CFX_CountedFaceCache {
  public:
   CFX_FaceCache* m_Obj;
   FX_DWORD m_nCount;
 };
 
 class CFX_FontCache {
  public:
+  CFX_FontCache();
   ~CFX_FontCache();
   CFX_FaceCache* GetCachedFace(CFX_Font* pFont);
   void ReleaseCachedFace(CFX_Font* pFont);
   void FreeCache(FX_BOOL bRelease = FALSE);
 
  private:
   using CFX_FTCacheMap = std::map<FXFT_Face, CFX_CountedFaceCache*>;
   CFX_FTCacheMap m_FTFaceMap;
   CFX_FTCacheMap m_ExtFaceMap;
 };
+
 class CFX_AutoFontCache {
  public:
   CFX_AutoFontCache(CFX_FontCache* pFontCache, CFX_Font* pFont)
       : m_pFontCache(pFontCache), m_pFont(pFont) {}
   ~CFX_AutoFontCache() { m_pFontCache->ReleaseCachedFace(m_pFont); }
   CFX_FontCache* m_pFontCache;
   CFX_Font* m_pFont;
 };
 #define FX_FONTCACHE_DEFINE(pFontCache, pFont) \
   CFX_AutoFontCache autoFontCache((pFontCache), (pFont))
@@ skipping 67 matching lines @@
 
  protected:
   virtual ~IFX_GSUBTable() {}
 };
 
 CFX_ByteString GetNameFromTT(const uint8_t* name_table, FX_DWORD name);
 
 int PDF_GetStandardFontName(CFX_ByteString* name);
 
 #endif  // CORE_INCLUDE_FXGE_FX_FONT_H_