diff options
author | 2014-05-31 00:15:22 +0000 | |
---|---|---|
committer | 2014-05-31 00:15:22 +0000 | |
commit | f71e8fd0c5d2da9795d00a5b81b716ae585be14a (patch) | |
tree | fe05847a2462ba087f532fdd002c076dbdce541b /src/core/SkTypeface.cpp | |
parent | 56f7cca144c539ec01f00d6382fded362ff193a3 (diff) |
Revert of Port most uses of SkOnce to SkLazyPtr. (https://codereview.chromium.org/304383005/)
Reason for revert:
linux x86-64 release segfault in src/ports/SkFontHost_fontconfig.cpp:107
http://108.170.220.120:10117/builders/Test-Ubuntu12-ShuttleA-GTX660-x86_64-Release/builds/905/steps/RunTests/logs/stdio
Original issue's description:
> Port most uses of SkOnce to SkLazyPtr.
>
> BUG=skia:
>
> Committed: http://code.google.com/p/skia/source/detail?r=15006
>
> Committed: http://code.google.com/p/skia/source/detail?r=15014
R=reed@google.com, mtklein@chromium.org
TBR=mtklein@chromium.org, reed@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Author: mtklein@google.com
Review URL: https://codereview.chromium.org/306063004
git-svn-id: http://skia.googlecode.com/svn/trunk@15015 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/core/SkTypeface.cpp')
-rw-r--r-- | src/core/SkTypeface.cpp | 37 |
1 files changed, 24 insertions, 13 deletions
diff --git a/src/core/SkTypeface.cpp b/src/core/SkTypeface.cpp index 6139c1e411..cd3953ba98 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 "SkLazyPtr.h" +#include "SkOnce.h" #include "SkStream.h" #include "SkTypeface.h" @@ -74,23 +74,34 @@ protected: } }; -SkTypeface* SkTypeface::CreateDefault(int style) { - SkTypeface* t = SkFontHost::CreateTypeface(NULL, NULL, (Style)style); - return t ? t : SkEmptyTypeface::Create(); -} +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); -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); +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(); + } } SkTypeface* SkTypeface::GetDefaultTypeface(Style style) { - SK_DECLARE_STATIC_LAZY_PTR_ARRAY(SkTypeface, defaults, 4, CreateDefault, DeleteDefault); + 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)); - SkASSERT((int)style < 4); - return defaults[style]; + SkOnce(&gDefaultTypefaceOnce[style], SkTypeface::create_default_typeface, style); + return gDefaultTypefaces[style]; } SkTypeface* SkTypeface::RefDefault(Style style) { |