Refactor fx_font part 2

xfa/fgas/font/fgas_gefont.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 "xfa/fgas/font/fgas_gefont.h"
 
+#include "core/fxge/include/cfx_unicodeencoding.h"
+#include "core/fxge/include/cfx_unicodeencodingex.h"

[dsinclair, 2016/08/18 17:43:03]

This needs to be inside an #ifdef PDF_ENABLE_XFA block now.

[npm, 2016/08/18 17:53:23]

Why? The whole xfa directory is under if(pdf_enable_xfa) already in Build.gn

 #include "xfa/fgas/crt/fgas_codepage.h"
 #include "xfa/fgas/font/fgas_fontutils.h"
 #include "xfa/fxfa/include/xfa_fontmgr.h"
 
 // static
 CFGAS_GEFont* CFGAS_GEFont::LoadFont(const FX_WCHAR* pszFontFamily,
                                      uint32_t dwFontStyles,
                                      uint16_t wCodePage,
                                      IFGAS_FontMgr* pFontMgr) {
 #if _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_
@@ skipping 429 matching lines @@
   }
   if (m_pRectArray) {
     m_pRectArray->RemoveAll(FALSE);
   }
 }
 CFGAS_GEFont* CFGAS_GEFont::GetSubstFont(int32_t iGlyphIndex) const {
   iGlyphIndex = ((uint32_t)iGlyphIndex) >> 24;
   return iGlyphIndex == 0 ? const_cast<CFGAS_GEFont*>(this)
                           : m_SubstFonts[iGlyphIndex - 1];
 }