diff options
| author | Derek Sollenberger <djsollen@google.com> | 2012-03-12 15:59:01 -0400 |
|---|---|---|
| committer | Derek Sollenberger <djsollen@google.com> | 2012-03-12 15:59:01 -0400 |
| commit | a8a1f8b5da30d0ce9091b8475d336c4ddb0f2b4e (patch) | |
| tree | 1f4289d1f765d793e8c942ca5b3b87fa56a30258 /src/ports/SkFontHost_fontconfig.cpp | |
| parent | 573b53f8618997434563ae650004f89a20aaf631 (diff) | |
| parent | 2a049989f422cb1f59e9e05f413d13745f34a3d1 (diff) | |
| download | external_skia-a8a1f8b5da30d0ce9091b8475d336c4ddb0f2b4e.zip external_skia-a8a1f8b5da30d0ce9091b8475d336c4ddb0f2b4e.tar.gz external_skia-a8a1f8b5da30d0ce9091b8475d336c4ddb0f2b4e.tar.bz2 | |
resolved conflicts for merge of 2a049989 to master
Change-Id: Ia1cbb6b274e1b3739704de9dd997e6d5dc5185af
Diffstat (limited to 'src/ports/SkFontHost_fontconfig.cpp')
| -rw-r--r-- | src/ports/SkFontHost_fontconfig.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/ports/SkFontHost_fontconfig.cpp b/src/ports/SkFontHost_fontconfig.cpp index acc5ae0..775a7c7 100644 --- a/src/ports/SkFontHost_fontconfig.cpp +++ b/src/ports/SkFontHost_fontconfig.cpp @@ -38,7 +38,7 @@ SkTypeface::Style find_name_and_style(SkStream* stream, SkString* name); // Although truetype fonts can support multiple faces in a single file, at the // moment Skia doesn't. // ----------------------------------------------------------------------------- -static SkMutex global_fc_map_lock; +SK_DECLARE_STATIC_MUTEX(global_fc_map_lock); static std::map<std::string, unsigned> global_fc_map; static std::map<unsigned, std::string> global_fc_map_inverted; static std::map<uint32_t, SkTypeface *> global_fc_typefaces; @@ -304,12 +304,6 @@ SkTypeface* SkFontHost::CreateTypefaceFromFile(const char path[]) } // static -bool SkFontHost::ValidFontID(SkFontID uniqueID) { - SkAutoMutexAcquire ac(global_fc_map_lock); - return global_fc_typefaces.find(uniqueID) != global_fc_typefaces.end(); -} - -// static SkStream* SkFontHost::OpenStream(uint32_t id) { SkAutoMutexAcquire ac(global_fc_map_lock); |