Refactor SkFontHost_linux into SkFontMgr_custom.

src/ports/SkFontMgr_custom.cpp

 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkFontHost_FreeType_common.h"
 #include "SkFontDescriptor.h"
 #include "SkFontMgr.h"
+#include "SkFontMgr_custom.h"
 #include "SkDescriptor.h"
 #include "SkOSFile.h"
 #include "SkPaint.h"
 #include "SkRTConf.h"
 #include "SkString.h"
 #include "SkStream.h"
 #include "SkThread.h"
 #include "SkTSearch.h"
 #include "SkTypefaceCache.h"
 #include "SkTArray.h"
@@ skipping 59 matching lines @@
         *ttcIndex = this->getIndex();
         return fStream->duplicate();
     }
 
 private:
     const SkAutoTDelete<const SkStreamAsset> fStream;
 
     typedef SkTypeface_Custom INHERITED;
 };
 
-// This configuration option is useful if we need to open and hold handles to
-// all found system font data (e.g., for skfiddle, where the application can't
-// access the filesystem to read fonts on demand)
-
-SK_CONF_DECLARE(bool, c_CustomTypefaceRetain, "fonts.customFont.retainAllData", false,
-                "Retain the open stream for each found font on the system.");
-
 /** The file SkTypeface implementation for the custom font manager. */
 class SkTypeface_File : public SkTypeface_Custom {
 public:
     SkTypeface_File(const SkFontStyle& style, bool isFixedPitch, bool sysFont,
                     const SkString familyName, const char path[], int index)
         : INHERITED(style, isFixedPitch, sysFont, familyName, index)
         , fPath(path)
-        , fStream(c_CustomTypefaceRetain ? SkStream::NewFromFile(fPath.c_str()) : NULL)
     { }
 
 protected:
     SkStreamAsset* onOpenStream(int* ttcIndex) const override {
         *ttcIndex = this->getIndex();
-        if (fStream.get()) {
-            return fStream->duplicate();
-        } else {
-            return SkStream::NewFromFile(fPath.c_str());
-        }
+        return SkStream::NewFromFile(fPath.c_str());
     }
 
 private:
     SkString fPath;
-    const SkAutoTDelete<SkStreamAsset> fStream;
 
     typedef SkTypeface_Custom INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 /**
  *  SkFontStyleSet_Custom
  *
  *  This class is used by SkFontMgr_Custom to hold SkTypeface_Custom families.
@@ skipping 76 matching lines @@
  *  to load fonts from any source by changing the initialization.
  */
 class SkFontMgr_Custom : public SkFontMgr {
 public:
     typedef SkTArray<SkAutoTUnref<SkFontStyleSet_Custom>, true> Families;
     class SystemFontLoader {
     public:
         virtual ~SystemFontLoader() { }
         virtual void loadSystemFonts(const SkTypeface_FreeType::Scanner&, Families*) const = 0;
     };
-    explicit SkFontMgr_Custom(const SystemFontLoader& loader) {
+    explicit SkFontMgr_Custom(const SystemFontLoader& loader) : fDefaultFamily(NULL) {
         loader.loadSystemFonts(fScanner, &fFamilies);
 
         // Try to pick a default font.
         static const char* defaultNames[] = {
             "Arial", "Verdana", "Times New Roman", "Droid Sans", NULL
         };
         for (size_t i = 0; i < SK_ARRAY_COUNT(defaultNames); ++i) {
             SkFontStyleSet_Custom* set = this->onMatchFamily(defaultNames[i]);
             if (NULL == set) {
                 continue;
@@ skipping 206 matching lines @@
                 continue;
             }
             SkString dirname(SkOSPath::Join(directory.c_str(), name.c_str()));
             load_directory_fonts(scanner, dirname, suffix, families);
         }
     }
 
     SkString fBaseDirectory;
 };
 
+SK_API SkFontMgr* SkFontMgr_New_Custom_Directory(const char* dir) {
+    return new SkFontMgr_Custom(DirectorySystemFontLoader(dir));
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
 struct SkEmbeddedResource { const uint8_t* data; size_t size; };
 struct SkEmbeddedResourceHeader { const SkEmbeddedResource* entries; int count; };
 
 class EmbeddedSystemFontLoader : public SkFontMgr_Custom::SystemFontLoader {
 public:
     EmbeddedSystemFontLoader(const SkEmbeddedResourceHeader* header) : fHeader(header) { }
 
     void loadSystemFonts(const SkTypeface_FreeType::Scanner& scanner,
                          SkFontMgr_Custom::Families* families) const override
     {
@@ skipping 55 matching lines @@
                 addTo = new SkFontStyleSet_Custom(realname);
                 families->push_back().reset(addTo);
             }
             addTo->appendTypeface(tf);
         }
     }
 
     const SkEmbeddedResourceHeader* fHeader;
 };
 
-#ifdef SK_EMBEDDED_FONTS
-
-extern "C" const SkEmbeddedResourceHeader SK_EMBEDDED_FONTS;
-SkFontMgr* SkFontMgr::Factory() {
-    return new SkFontMgr_Custom(EmbeddedSystemFontLoader(&SK_EMBEDDED_FONTS));
+SkFontMgr* SkFontMgr_New_Custom_Embedded(const SkEmbeddedResourceHeader* header) {
+    return new SkFontMgr_Custom(EmbeddedSystemFontLoader(header));
 }
-
-#else
-
-#ifndef SK_FONT_FILE_PREFIX
-#    define SK_FONT_FILE_PREFIX "/usr/share/fonts/"
-#endif
-SkFontMgr* SkFontMgr::Factory() {
-    return new SkFontMgr_Custom(DirectorySystemFontLoader(SK_FONT_FILE_PREFIX));
-}
-
-#endif