Move core/src/ up to core/.

core/fxge/ge/fx_ge_font.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 "core/fxge/ge/fx_text_int.h"
 #include "core/include/fxge/fx_freetype.h"
 #include "core/include/fxge/fx_ge.h"
-#include "core/src/fxge/ge/fx_text_int.h"
 
 #define EM_ADJUST(em, a) (em == 0 ? (a) : (a)*1000 / em)
 
 #ifdef PDF_ENABLE_XFA
 extern void _FPDFAPI_GetInternalFontData(int id1,
                                          const uint8_t*& data,
                                          FX_DWORD& size);
 #endif  // PDF_ENABLE_XFA
 
 namespace {
 
 #ifdef PDF_ENABLE_XFA
 const FX_DWORD g_EncodingID[] = {
-  FXFM_ENCODING_MS_SYMBOL,
-  FXFM_ENCODING_UNICODE,
-  FXFM_ENCODING_MS_SJIS,
-  FXFM_ENCODING_MS_GB2312,
-  FXFM_ENCODING_MS_BIG5,
-  FXFM_ENCODING_MS_WANSUNG,
-  FXFM_ENCODING_MS_JOHAB,
-  FXFM_ENCODING_ADOBE_STANDARD,
-  FXFM_ENCODING_ADOBE_EXPERT,
-  FXFM_ENCODING_ADOBE_CUSTOM,
-  FXFM_ENCODING_ADOBE_LATIN_1,
-  FXFM_ENCODING_OLD_LATIN_2,
-  FXFM_ENCODING_APPLE_ROMAN,
+    FXFM_ENCODING_MS_SYMBOL,     FXFM_ENCODING_UNICODE,
+    FXFM_ENCODING_MS_SJIS,       FXFM_ENCODING_MS_GB2312,
+    FXFM_ENCODING_MS_BIG5,       FXFM_ENCODING_MS_WANSUNG,
+    FXFM_ENCODING_MS_JOHAB,      FXFM_ENCODING_ADOBE_STANDARD,
+    FXFM_ENCODING_ADOBE_EXPERT,  FXFM_ENCODING_ADOBE_CUSTOM,
+    FXFM_ENCODING_ADOBE_LATIN_1, FXFM_ENCODING_OLD_LATIN_2,
+    FXFM_ENCODING_APPLE_ROMAN,
 };
 
 CFX_UnicodeEncodingEx* _FXFM_CreateFontEncoding(CFX_Font* pFont,
                                                 FX_DWORD nEncodingID) {
   if (FXFT_Select_Charmap(pFont->GetFace(), nEncodingID))
     return nullptr;
   return new CFX_UnicodeEncodingEx(pFont, nEncodingID);
 }
 #endif  // PDF_ENABLE_XFA
 
@@ skipping 403 matching lines @@
 }
 
 int CFX_Font::GetULthickness() const {
   if (!m_Face)
     return 0;
 
   return EM_ADJUST(FXFT_Get_Face_UnitsPerEM(m_Face),
                    FXFT_Get_Face_UnderLineThickness(m_Face));
 }
 
-CFX_UnicodeEncoding::CFX_UnicodeEncoding(CFX_Font* pFont) : m_pFont(pFont) {
-}
+CFX_UnicodeEncoding::CFX_UnicodeEncoding(CFX_Font* pFont) : m_pFont(pFont) {}
 
-CFX_UnicodeEncoding::~CFX_UnicodeEncoding() {
-}
+CFX_UnicodeEncoding::~CFX_UnicodeEncoding() {}
 
 FX_DWORD CFX_UnicodeEncoding::GlyphFromCharCode(FX_DWORD charcode) {
   FXFT_Face face = m_pFont->GetFace();
   if (!face)
     return charcode;
 
   if (FXFT_Select_Charmap(face, FXFT_ENCODING_UNICODE) == 0)
     return FXFT_Get_Char_Index(face, charcode);
 
   if (m_pFont->GetSubstFont() && m_pFont->GetSubstFont()->m_Charset == 2) {
     FX_DWORD index = 0;
     if (FXFT_Select_Charmap(face, FXFT_ENCODING_MS_SYMBOL) == 0)
       index = FXFT_Get_Char_Index(face, charcode);
     if (!index && !FXFT_Select_Charmap(face, FXFT_ENCODING_APPLE_ROMAN))
       return FXFT_Get_Char_Index(face, charcode);
   }
   return charcode;
 }
 
 #ifdef PDF_ENABLE_XFA
 CFX_UnicodeEncodingEx::CFX_UnicodeEncodingEx(CFX_Font* pFont,
                                              FX_DWORD EncodingID)
-    : CFX_UnicodeEncoding(pFont), m_nEncodingID(EncodingID) {
-}
+    : CFX_UnicodeEncoding(pFont), m_nEncodingID(EncodingID) {}
 
-CFX_UnicodeEncodingEx::~CFX_UnicodeEncodingEx() {
-}
+CFX_UnicodeEncodingEx::~CFX_UnicodeEncodingEx() {}
 
 FX_DWORD CFX_UnicodeEncodingEx::GlyphFromCharCode(FX_DWORD charcode) {
   FXFT_Face face = m_pFont->GetFace();
   FT_UInt nIndex = FXFT_Get_Char_Index(face, charcode);
   if (nIndex > 0) {
     return nIndex;
   }
   int nmaps = FXFT_Get_Face_CharmapCount(face);
   int m = 0;
   while (m < nmaps) {
@@ skipping 45 matching lines @@
   for (size_t i = 0; i < FX_ArraySize(g_EncodingID); ++i) {
     CFX_UnicodeEncodingEx* pFontEncoding =
         _FXFM_CreateFontEncoding(pFont, g_EncodingID[i]);
     if (pFontEncoding) {
       return pFontEncoding;
     }
   }
   return NULL;
 }
 #endif  // PDF_ENABLE_XFA