Refactor SkFontHost_linux into SkFontMgr_custom.

gyp/ports.gyp

Index: gyp/ports.gyp
diff --git a/gyp/ports.gyp b/gyp/ports.gyp
index 79687933e314423ebc92b7170066f5efc576a17b..f3a3faf68e14fbf99e9a89755b5117c2140f38e7 100644
--- a/gyp/ports.gyp
+++ b/gyp/ports.gyp
@@ -32,9 +32,11 @@
         '../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',
@@ -57,6 +59,9 @@
         '../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': [
@@ -82,8 +87,10 @@
                 ],
               },
               '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': [
@@ -112,8 +119,10 @@
                 ],
               },
               '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': [
@@ -168,21 +177,15 @@
           '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',