Refactor SkFontHost_linux into SkFontMgr_custom.

gyp/ports.gyp

 # Copyright 2015 Google Inc.
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 # Port-specific Skia library code.
 {
   'targets': [
     {
       'target_name': 'ports',
       'product_name': 'skia_ports',
@@ skipping 14 matching lines @@
         '../src/sfnt',
         '../src/utils',
       ],
       'sources': [
         '../src/ports/SkDebug_stdio.cpp',
         '../src/ports/SkDebug_win.cpp',
 
         '../src/fonts/SkFontMgr_indirect.cpp',
         '../src/fonts/SkRemotableFontMgr.cpp',
         '../src/ports/SkFontHost_win.cpp',
-        '../src/ports/SkFontMgr_default_gdi.cpp',
-        '../src/ports/SkFontMgr_default_dw.cpp',
+        '../src/ports/SkFontMgr_custom_directory_factory.cpp',
+        '../src/ports/SkFontMgr_custom_embedded_factory.cpp',
         '../src/ports/SkFontMgr_win_dw.cpp',
+        '../src/ports/SkFontMgr_win_dw_factory.cpp',
+        '../src/ports/SkFontMgr_win_gdi_factory.cpp',
         '../src/ports/SkRemotableFontMgr_win_dw.cpp',
         '../src/ports/SkScalerContext_win_dw.cpp',
         '../src/ports/SkScalerContext_win_dw.h',
         '../src/ports/SkTypeface_win_dw.cpp',
         '../src/ports/SkTypeface_win_dw.h',
 
         '../src/ports/SkGlobalInitialization_default.cpp',
         '../src/ports/SkMemory_malloc.cpp',
         '../src/ports/SkOSFile_posix.cpp',
         '../src/ports/SkOSFile_stdio.cpp',
         '../src/ports/SkOSFile_win.cpp',
         '../src/ports/SkDiscardableMemory_none.cpp',
         '../src/ports/SkTime_Unix.cpp',
         '../src/ports/SkTime_win.cpp',
         '../src/ports/SkTLS_pthread.cpp',
         '../src/ports/SkTLS_win.cpp',
 
         '../include/ports/SkFontConfigInterface.h',
         '../include/ports/SkFontMgr.h',
         '../include/ports/SkFontMgr_indirect.h',
         '../include/ports/SkRemotableFontMgr.h',
       ],
+      'sources/': [
+        ['exclude', 'SkFontMgr_.+_factory\\.cpp$'],
+      ],
       'conditions': [
         [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos", "android"]', {
           'sources': [
             '../src/ports/SkFontHost_FreeType.cpp',
             '../src/ports/SkFontHost_FreeType_common.cpp',
           ],
           'dependencies': [
             'freetype.gyp:freetype',
           ],
         }],
         [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos"]', {
           'conditions': [
             [ 'skia_embedded_fonts', {
               'link_settings': {
                 'libraries': [
                   '-ldl',
                 ],
               },
               'variables': {
                 'embedded_font_data_identifier': 'sk_fonts',
                 'fonts_to_include': [
                   '../resources/fonts/Funkster.ttf',
                 ],
               },
               'sources': [
-                '../src/ports/SkFontHost_linux.cpp',
+                '../include/ports/SkFontMgr_custom.h',
+                '../src/ports/SkFontMgr_custom.cpp',
               ],
+              'sources/': [['include', '../src/ports/SkFontMgr_custom_embedded_factory.cpp']],
               'actions': [{
                 'action_name': 'generate_embedded_font_data',
                 'inputs': [
                   '../tools/embed_resources.py',
                   '<@(fonts_to_include)',
                 ],
                 'outputs': [
                   '<(SHARED_INTERMEDIATE_DIR)/ports/fonts/fonts.cpp',
                 ],
                 'action': ['python', '../tools/embed_resources.py',
                                      '--align', '4',
                                      '--name', '<(embedded_font_data_identifier)',
                                      '--input', '<@(fonts_to_include)',
                                      '--output', '<@(_outputs)',
                 ],
                 'message': 'Generating <@(_outputs)',
                 'process_outputs_as_sources': 1,
               }],
               'defines': [
                 'SK_EMBEDDED_FONTS=<(embedded_font_data_identifier)',
               ],
             }, 'skia_no_fontconfig', {
               'link_settings': {
                 'libraries': [
                   '-ldl',
                 ],
               },
               'sources': [
-                '../src/ports/SkFontHost_linux.cpp',
+                '../include/ports/SkFontMgr_custom.h',
+                '../src/ports/SkFontMgr_custom.cpp',
               ],
+              'sources/': [['include', '../src/ports/SkFontMgr_custom_directory_factory.cpp']],
             }, {
               'link_settings': {
                 'libraries': [
                   '-lfontconfig',
                   '-ldl',
                 ],
               },
               'sources': [
                 '../src/ports/SkFontMgr_fontconfig.cpp',
                 '../src/ports/SkFontHost_fontconfig.cpp',
@@ skipping 34 matching lines @@
           ],
           'sources!': [ # these are used everywhere but windows
             '../src/ports/SkDebug_stdio.cpp',
             '../src/ports/SkOSFile_posix.cpp',
             '../src/ports/SkTime_Unix.cpp',
             '../src/ports/SkTLS_pthread.cpp',
           ],
           'conditions': [
             #    when we build for win, we only want one of these default files
             [ 'skia_gdi', {
-              'sources!': [
-                '../src/ports/SkFontMgr_default_dw.cpp',
-              ],
+              'sources/': [['include', '../src/ports/SkFontMgr_win_gdi_factory.cpp']],
             }, { # normally default to direct write
-              'sources!': [
-                '../src/ports/SkFontMgr_default_gdi.cpp',
-              ],
+              'sources/': [['include', '../src/ports/SkFontMgr_win_dw_factory.cpp']],
             }],
           ],
         }, { # else !win
           'sources!': [
             '../src/ports/SkDebug_win.cpp',
             '../src/ports/SkFontHost_win.cpp',
-            '../src/ports/SkFontMgr_default_gdi.cpp',
-            '../src/ports/SkFontMgr_default_dw.cpp',
             '../src/ports/SkFontMgr_win_dw.cpp',
             '../src/ports/SkOSFile_win.cpp',
             '../src/ports/SkRemotableFontMgr_win_dw.cpp',
             '../src/ports/SkTime_win.cpp',
             '../src/ports/SkTLS_win.cpp',
             '../src/ports/SkScalerContext_win_dw.cpp',
             '../src/ports/SkScalerContext_win_dw.h',
             '../src/ports/SkTypeface_win_dw.cpp',
             '../src/ports/SkTypeface_win_dw.h',
           ],
@@ skipping 13 matching lines @@
         }],
       ],
       'direct_dependent_settings': {
         'include_dirs': [
           '../include/ports',
         ],
       },
     },
   ],
 }