Refactor fx_font part 2

pdfium.gyp

 # Copyright 2015 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.
 
 {
   'variables': {
     'chromium_code': 1,
     'pdf_use_skia%': 0,
     'pdf_enable_v8%': 1,
     'pdf_enable_xfa%': 0, # Set to 1 by standalone.gypi in a standalone build.
@@ skipping 728 matching lines @@
         'core/fxge/ge/cfx_cliprgn.h',
         'core/fxge/ge/cfx_folderfontinfo.cpp',
         'core/fxge/ge/cfx_folderfontinfo.h',
         'core/fxge/ge/cfx_fontcache.cpp',
         'core/fxge/ge/cfx_fontmapper.cpp',
         'core/fxge/ge/cfx_fontmgr.cpp',
         'core/fxge/ge/cfx_gemodule.cpp',
         'core/fxge/ge/cfx_graphstatedata.cpp',
         'core/fxge/ge/cfx_pathdata.cpp',
         'core/fxge/ge/cfx_renderdevice.cpp',
+        'core/fxge/ge/cfx_unicodeencoding.cpp',
         'core/fxge/ge/include/cfx_fontmapper.h',
         'core/fxge/ge/include/cfx_fontmgr.h',
         'core/fxge/ge/include/ifx_systemfontinfo.h',
         'core/fxge/ge/fx_ge_font.cpp',
         'core/fxge/ge/fx_ge_fontmap.cpp',
         'core/fxge/ge/fx_ge_linux.cpp',
         'core/fxge/ge/fx_ge_text.cpp',
         'core/fxge/ge/fx_text_int.h',
         'core/fxge/ifx_renderdevicedriver.cpp',
         'core/fxge/include/cfx_autofontcache.h',
         'core/fxge/include/cfx_fontcache.h',
         'core/fxge/include/cfx_fxgedevice.h',
         'core/fxge/include/cfx_gemodule.h',
         'core/fxge/include/cfx_graphstatedata.h',
         'core/fxge/include/cfx_pathdata.h',
         'core/fxge/include/cfx_renderdevice.h',
+        'core/fxge/include/cfx_unicodeencoding.h',
         'core/fxge/include/cfx_windowsdevice.h',
         'core/fxge/include/fx_dib.h',
         'core/fxge/include/fx_font.h',
         'core/fxge/include/fx_freetype.h',
         'core/fxge/include/ifx_renderdevicedriver.h',
         'core/fxge/win32/cfx_windowsdib.h',
       ],
       'variables': {
         'clang_warning_flags': [
           # http://code.google.com/p/pdfium/issues/detail?id=188
           '-Wno-switch',
         ],
       },
       'conditions': [
+        ['pdf_enable_xfa==1', {
+          'sources': [
+            'core/fxge/ge/cfx_unicodeencodingex.cpp',
+            'core/fxge/include/cfx_unicodeencodingex.h',
+          ]
+        }],
         ['pdf_use_skia==1', {
           'sources': [
             'core/fxge/skia/fx_skia_device.cpp',
           ],
           'sources!': [
             'core/fxge/agg/fx_agg_driver.h',
             'core/fxge/agg/fx_agg_driver.cpp',
           ],
           'dependencies': [
             '<(DEPTH)/skia/skia.gyp:skia',
@@ skipping 363 matching lines @@
             'fpdfsdk/fpdfxfa/include/fpdfxfa_app.h',
             'fpdfsdk/fpdfxfa/include/fpdfxfa_doc.h',
             'fpdfsdk/fpdfxfa/include/fpdfxfa_page.h',
             'fpdfsdk/fpdfxfa/include/fpdfxfa_util.h',
           ],
         },
       ]
     }],
   ]
 }