diff options
Diffstat (limited to 'src/core/SkGlyphCache.cpp')
| -rw-r--r-- | src/core/SkGlyphCache.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/core/SkGlyphCache.cpp b/src/core/SkGlyphCache.cpp index 309f494828..7256de6cdc 100644 --- a/src/core/SkGlyphCache.cpp +++ b/src/core/SkGlyphCache.cpp @@ -8,7 +8,7 @@ #include "SkGlyphCache.h" #include "SkGlyphCache_Globals.h" #include "SkGraphics.h" -#include "SkOncePtr.h" +#include "SkOnce.h" #include "SkPath.h" #include "SkTemplates.h" #include "SkTraceMemoryDump.h" @@ -23,9 +23,12 @@ const char gGlyphCacheDumpName[] = "skia/sk_glyph_cache"; } // namespace // Returns the shared globals -SK_DECLARE_STATIC_ONCE_PTR(SkGlyphCache_Globals, globals); static SkGlyphCache_Globals& get_globals() { - return *globals.get([]{ return new SkGlyphCache_Globals; }); + static SkOnce once; + static SkGlyphCache_Globals* globals; + + once([]{ globals = new SkGlyphCache_Globals; }); + return *globals; } /////////////////////////////////////////////////////////////////////////////// |