Make code compile with clang_use_chrome_plugin (part I)

core/fpdfapi/fpdf_font/font_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_FPDFAPI_FPDF_FONT_FONT_INT_H_
 #define CORE_FPDFAPI_FPDF_FONT_FONT_INT_H_
 
 #include <map>
@@ skipping 10 matching lines @@
 typedef void* FXFT_Library;
 
 short TT2PDF(int m, FXFT_Face face);
 FX_BOOL FT_UseTTCharmap(FXFT_Face face, int platform_id, int encoding_id);
 CIDSet CharsetFromOrdering(const CFX_ByteStringC& ordering);
 
 class CPDF_CMapManager {
  public:
   CPDF_CMapManager();
   ~CPDF_CMapManager();
+
   void* GetPackage(FX_BOOL bPrompt);
   CPDF_CMap* GetPredefinedCMap(const CFX_ByteString& name, FX_BOOL bPromptCJK);
   CPDF_CID2UnicodeMap* GetCID2UnicodeMap(CIDSet charset, FX_BOOL bPromptCJK);
   void ReloadAll();
 
  private:
   CPDF_CMap* LoadPredefinedCMap(const CFX_ByteString& name, FX_BOOL bPromptCJK);
   CPDF_CID2UnicodeMap* LoadCID2UnicodeMap(CIDSet charset, FX_BOOL bPromptCJK);
 
   FX_BOOL m_bPrompted;
@@ skipping 41 matching lines @@
 
 struct CMap_CodeRange {
   int m_CharSize;
   uint8_t m_Lower[4];
   uint8_t m_Upper[4];
 };
 
 class CPDF_CMapParser {
  public:
   CPDF_CMapParser();
-  ~CPDF_CMapParser() {}
+  ~CPDF_CMapParser();
   FX_BOOL Initialize(CPDF_CMap* pMap);
   void ParseWord(const CFX_ByteStringC& str);
   CFX_BinaryBuf m_AddMaps;
 
  private:
   friend class fpdf_font_cid_CMap_GetCode_Test;
   friend class fpdf_font_cid_CMap_GetCodeRange_Test;
 
   static uint32_t CMap_GetCode(const CFX_ByteStringC& word);
   static bool CMap_GetCodeRange(CMap_CodeRange& range,
                                 const CFX_ByteStringC& first,
                                 const CFX_ByteStringC& second);
 
   CPDF_CMap* m_pCMap;
   int m_Status;
   int m_CodeSeq;
   uint32_t m_CodePoints[4];
   CFX_ArrayTemplate<CMap_CodeRange> m_CodeRanges;
-  CFX_ByteString m_Registry, m_Ordering, m_Supplement;
+  CFX_ByteString m_Registry;
+  CFX_ByteString m_Ordering;
+  CFX_ByteString m_Supplement;
   CFX_ByteString m_LastWord;
 };
 
 enum CIDCoding : uint8_t {
   CIDCODING_UNKNOWN = 0,
   CIDCODING_GB,
   CIDCODING_BIG5,
   CIDCODING_JIS,
   CIDCODING_KOREA,
   CIDCODING_UCS2,
@@ skipping 11 matching lines @@
   };
 
   CPDF_CMap();
   ~CPDF_CMap();
 
   FX_BOOL LoadPredefined(CPDF_CMapManager* pMgr,
                          const FX_CHAR* name,
                          FX_BOOL bPromptCJK);
   FX_BOOL LoadEmbedded(const uint8_t* pData, uint32_t dwSize);
   void Release();
-  FX_BOOL IsLoaded() const { return m_bLoaded; }

[Lei Zhang, 2016/06/13 20:44:28]

Curious why these simple getters can't be inlined.

[Wei Li, 2016/06/13 21:38:03]

These are not needed by clang plugins, but to make things
consistent as they are the only two in the file used inline
functions although some constructors/distructors and
CPDF_CID2UnicodeMap::IsLoaded() are small enough also.

-  FX_BOOL IsVertWriting() const { return m_bVertical; }
+
+  FX_BOOL IsLoaded() const;
+  FX_BOOL IsVertWriting() const;
   uint16_t CIDFromCharCode(uint32_t charcode) const;
   uint32_t CharCodeFromCID(uint16_t CID) const;
   int GetCharSize(uint32_t charcode) const;
   uint32_t GetNextChar(const FX_CHAR* pString, int nStrLen, int& offset) const;
   int CountChar(const FX_CHAR* pString, int size) const;
   int AppendChar(FX_CHAR* str, uint32_t charcode) const;
 
  protected:
   friend class CPDF_CMapParser;
   friend class CPDF_CMapManager;
@@ skipping 10 matching lines @@
   uint8_t* m_pAddMapping;
   FX_BOOL m_bLoaded;
   const FXCMAP_CMap* m_pEmbedMap;
   CPDF_CMap* m_pUseMap;
 };
 
 class CPDF_CID2UnicodeMap {
  public:
   CPDF_CID2UnicodeMap();
   ~CPDF_CID2UnicodeMap();
+
   FX_BOOL Initialize();
   FX_BOOL IsLoaded();
   void Load(CPDF_CMapManager* pMgr, CIDSet charset, FX_BOOL bPromptCJK);
   FX_WCHAR UnicodeFromCID(uint16_t CID);
 
  protected:
   CIDSet m_Charset;
   const uint16_t* m_pEmbeddedMap;
   uint32_t m_EmbeddedCount;
 };
 
 class CPDF_ToUnicodeMap {
  public:
+  CPDF_ToUnicodeMap();
+  ~CPDF_ToUnicodeMap();
+
   void Load(CPDF_Stream* pStream);
-  CFX_WideString Lookup(uint32_t charcode);
-  uint32_t ReverseLookup(FX_WCHAR unicode);
+
+  CFX_WideString Lookup(uint32_t charcode) const;
+  uint32_t ReverseLookup(FX_WCHAR unicode) const;
 
  protected:
   std::map<uint32_t, uint32_t> m_Map;
   CPDF_CID2UnicodeMap* m_pBaseMap;
   CFX_WideTextBuf m_MultiCharBuf;
 
  private:
   friend class fpdf_font_StringToCode_Test;
   friend class fpdf_font_StringToWideString_Test;
 
   static uint32_t StringToCode(const CFX_ByteStringC& str);
   static CFX_WideString StringToWideString(const CFX_ByteStringC& str);
 };
 
 void FPDFAPI_LoadCID2UnicodeMap(CIDSet charset,
                                 const uint16_t*& pMap,
                                 uint32_t& count);
 
 #endif  // CORE_FPDFAPI_FPDF_FONT_FONT_INT_H_