diff options
| author |  bungeman <bungeman@google.com> | 2016-05-02 11:54:13 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-05-02 11:54:13 -0700 |
| commit | 0265707c191a31dfde08dd1cd7011c1fe5b8e643 (patch) | |
| tree | 919635b2cf13cc3c639126c42e6098130e2e2c30 /src/ports/SkFontConfigInterface_direct.h | |
| parent | c5091b5b6c4b8a7aef8c12db9ea2a85e907b01c4 (diff) | |
Clean up SkFontConfigInterface implementation.
Renames some classes to avoid confusion with FontConfig.
Removed direct calls to FontConfig instead of calling FCI.
Moves the globals and factory to one (optional) file.
Moves font management code from typeface to font manager.
Adds index to fonts created from streams.
Associates FCI typefaces with the FCI instance which provides its identity.
Simplifies the singleton initialization.
Review-Url: https://codereview.chromium.org/1936213002
Diffstat (limited to 'src/ports/SkFontConfigInterface_direct.h')
| -rw-r--r-- | src/ports/SkFontConfigInterface_direct.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/ports/SkFontConfigInterface_direct.h b/src/ports/SkFontConfigInterface_direct.h index 3f0af82699..3ccb390a70 100644 --- a/src/ports/SkFontConfigInterface_direct.h +++ b/src/ports/SkFontConfigInterface_direct.h @@ -8,7 +8,6 @@ /* migrated from chrome/src/skia/ext/SkFontHost_fontconfig_direct.cpp */ #include "SkFontConfigInterface.h" -#include "SkMutex.h" #include <fontconfig/fontconfig.h> @@ -32,8 +31,6 @@ protected: virtual bool isAccessible(const char* filename); private: - SkMutex mutex_; - bool isValidPattern(FcPattern* pattern); FcPattern* MatchFont(FcFontSet* font_set, const char* post_config_family, const SkString& family); |