diff options
| author |  mtklein <mtklein@chromium.org> | 2016-05-04 14:40:18 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-05-04 14:40:18 -0700 |
| commit | 9bd3fc7fa9bb7cad050bd619aa93d4c48ebb5c02 (patch) | |
| tree | 34a4f19d22263c547d2a53734caf179797fb9b53 /src/ports/SkFontHost_mac.cpp | |
| parent | f2509381bdd9e712919418f7ebe831f974208154 (diff) | |
SkOncePtr -> SkOnce
It's always nice to kill off a synchronization primitive.
And while less terse, I think this new code reads more clearly.
... and, SkOncePtr's tests were the only thing now using sk_num_cores()
outside of SkTaskGroup, so I've hidden it as static inside SkTaskGroup.cpp.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1953533002
CQ_EXTRA_TRYBOTS=client.skia:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD-Trybot
Review-Url: https://codereview.chromium.org/1953533002
Diffstat (limited to 'src/ports/SkFontHost_mac.cpp')
| -rw-r--r-- | src/ports/SkFontHost_mac.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/ports/SkFontHost_mac.cpp b/src/ports/SkFontHost_mac.cpp index 72d4690870..8593b39611 100644 --- a/src/ports/SkFontHost_mac.cpp +++ b/src/ports/SkFontHost_mac.cpp @@ -35,7 +35,7 @@ #include "SkOTTable_hhea.h" #include "SkOTTable_loca.h" #include "SkOTUtils.h" -#include "SkOncePtr.h" +#include "SkOnce.h" #include "SkPaint.h" #include "SkPath.h" #include "SkSFNTHeader.h" @@ -778,12 +778,12 @@ static CTFontDrawGlyphsProc* choose_CTFontDrawGlyphs() { return &legacy_CTFontDrawGlyphs; } -SK_DECLARE_STATIC_ONCE_PTR(CTFontDrawGlyphsProc, gCTFontDrawGlyphs); - CGRGBPixel* Offscreen::getCG(const SkScalerContext_Mac& context, const SkGlyph& glyph, CGGlyph glyphID, size_t* rowBytesPtr, bool generateA8FromLCD) { - auto ctFontDrawGlyphs = gCTFontDrawGlyphs.get(choose_CTFontDrawGlyphs); + static SkOnce once; + static CTFontDrawGlyphsProc* ctFontDrawGlyphs; + once([]{ ctFontDrawGlyphs = choose_CTFontDrawGlyphs(); }); if (!fRGBSpace) { //It doesn't appear to matter what color space is specified. |