Merge pull request #45 from livecode/peter-b/js/bugfix-15811

[Bug 15811][emscripten] Tweaks to libskia font support

Author: peter-b

libskia/libskia.gyp

@@ -426,7 +426,6 @@
 				'src/ports/SkAtomics_win.h',
 				'src/ports/SkFontConfigParser_android.h',
 				'src/ports/SkFontConfigTypeface.h',
-				'src/ports/SkFontHost_FreeType_common.h',
 				'src/ports/SkMutex_none.h',
 				'src/ports/SkMutex_pthread.h',
 				'src/ports/SkMutex_win.h',
@@ -555,22 +554,29 @@
 					{
 						'sources!':
 						[
-							'src/ports/SkFontHost_fontconfig.cpp',
 							'src/ports/SkFontHost_FreeType.cpp',
 							'src/ports/SkFontHost_FreeType_common.cpp',
-                                                        'src/fonts/SkFontMgr_fontconfig.cpp',
-							
 							'src/sfnt/SkOTTable_name.cpp',
 							'src/sfnt/SkOTUtils.cpp',
 						],
 					},
 				],
+				[
+					'OS != "android"',
+					{
+						'sources!':
+						[
+							'src/ports/SkFontHost_fontconfig.cpp',
+                                                        'src/fonts/SkFontMgr_fontconfig.cpp',
+						],
+					},
+				],
                                 [
                                         'OS == "emscripten"',
                                         {
                                                 'defines':
                                                 [
-                                                       'SK_FONT_FILE_PREFIX="/boot/fonts/"',
+                                                       'SK_FONT_FILE_PREFIX="/boot/standalone/"',
                                                 ],
 
                                                 'dependencies':

libskia/src/ports/SkFontHost_linux.cpp

@@ -379,6 +379,7 @@ class SkFontMgr_Custom : public SkFontMgr {
         static const char* gDefaultNames[] = {
             "Arial", "Verdana", "Times New Roman", NULL
         };
+        gDefaultNormal = NULL;
         for (size_t i = 0; i < SK_ARRAY_COUNT(gDefaultNames); ++i) {
             SkFontStyleSet_Custom* set = this->onMatchFamily(gDefaultNames[i]);
             if (NULL == set) {