diff options
author | 2014-05-30 23:59:12 +0000 | |
---|---|---|
committer | 2014-05-30 23:59:12 +0000 | |
commit | 56f7cca144c539ec01f00d6382fded362ff193a3 (patch) | |
tree | 320e51ca850b8c7bf5ef14e1c523d385674eca14 /src/core/SkTypeface.cpp | |
parent | 22a1d96ca368a2d1fba40a541006be64af487ccd (diff) |
Port most uses of SkOnce to SkLazyPtr.
BUG=skia:
Committed: http://code.google.com/p/skia/source/detail?r=15006
R=reed@google.com, mtklein@google.com
Author: mtklein@chromium.org
Review URL: https://codereview.chromium.org/304383005
git-svn-id: http://skia.googlecode.com/svn/trunk@15014 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/core/SkTypeface.cpp')
-rw-r--r-- | src/core/SkTypeface.cpp | 37 |
1 files changed, 13 insertions, 24 deletions
diff --git a/src/core/SkTypeface.cpp b/src/core/SkTypeface.cpp index cd3953ba98..6139c1e411 100644 --- a/src/core/SkTypeface.cpp +++ b/src/core/SkTypeface.cpp @@ -8,7 +8,7 @@ #include "SkAdvancedTypefaceMetrics.h" #include "SkFontDescriptor.h" #include "SkFontHost.h" -#include "SkOnce.h" +#include "SkLazyPtr.h" #include "SkStream.h" #include "SkTypeface.h" @@ -74,34 +74,23 @@ protected: } }; -static SkTypeface* gDefaultTypefaces[] = { NULL, NULL, NULL, NULL }; -static const size_t FONT_STYLE_COUNT = SK_ARRAY_COUNT(gDefaultTypefaces); -static SkOnceFlag gDefaultTypefaceOnce[FONT_STYLE_COUNT] = { - SK_ONCE_INIT, SK_ONCE_INIT, SK_ONCE_INIT, SK_ONCE_INIT -}; -template <uintmax_t N> struct SkTIsPow2 { - static const bool value = (N & (N - 1)) == 0; -}; -SK_COMPILE_ASSERT(SkTIsPow2<FONT_STYLE_COUNT>::value, FONT_STYLE_COUNT_not_power_of_2); +SkTypeface* SkTypeface::CreateDefault(int style) { + SkTypeface* t = SkFontHost::CreateTypeface(NULL, NULL, (Style)style); + return t ? t : SkEmptyTypeface::Create(); +} -void SkTypeface::create_default_typeface(Style style) { - if (NULL == gDefaultTypefaces[style]) { - gDefaultTypefaces[style] = SkFontHost::CreateTypeface(NULL, NULL, style); - } - if (NULL == gDefaultTypefaces[style]) { - // FIXME: Use a singleton for SkEmptyTypeface. - gDefaultTypefaces[style] = SkEmptyTypeface::Create(); - } +void SkTypeface::DeleteDefault(SkTypeface* t) { + // The SkTypeface returned by SkFontHost::CreateTypeface may _itself_ be a + // cleverly-shared singleton. This is less than ideal. This means we + // cannot just assert our ownership and SkDELETE(t) like we'd want to. + SkSafeUnref(t); } SkTypeface* SkTypeface::GetDefaultTypeface(Style style) { - SkASSERT((size_t)style < FONT_STYLE_COUNT); - - // mask off any other bits to avoid a crash in SK_RELEASE - style = (Style)(style & (FONT_STYLE_COUNT - 1)); + SK_DECLARE_STATIC_LAZY_PTR_ARRAY(SkTypeface, defaults, 4, CreateDefault, DeleteDefault); - SkOnce(&gDefaultTypefaceOnce[style], SkTypeface::create_default_typeface, style); - return gDefaultTypefaces[style]; + SkASSERT((int)style < 4); + return defaults[style]; } SkTypeface* SkTypeface::RefDefault(Style style) { |