diff options
| author |  bungeman <bungeman@google.com> | 2016-05-11 12:38:18 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-05-11 12:38:18 -0700 |
| commit | 6296da736fbf40aae881650c239420f64e576c3f (patch) | |
| tree | 5121ecf46ff7099d8eb66d2b2a4671d5ad94db89 /gm/variedtext.cpp | |
| parent | c8699321b924c1f284df93cb29b86000c1d73c0a (diff) | |
Move SkTypeface to sk_sp.
Review-Url: https://codereview.chromium.org/1933393002
Diffstat (limited to 'gm/variedtext.cpp')
| -rw-r--r-- | gm/variedtext.cpp | 28 |
1 files changed, 10 insertions, 18 deletions
diff --git a/gm/variedtext.cpp b/gm/variedtext.cpp index 83fe7201fd..e295cbc998 100644 --- a/gm/variedtext.cpp +++ b/gm/variedtext.cpp @@ -21,13 +21,6 @@ public: VariedTextGM(bool effectiveClip, bool lcd) : fEffectiveClip(effectiveClip) , fLCD(lcd) { - memset(fTypefacesToUnref, 0, sizeof(fTypefacesToUnref)); - } - - ~VariedTextGM() { - for (size_t i = 0; i < SK_ARRAY_COUNT(fTypefacesToUnref); ++i) { - SkSafeUnref(fTypefacesToUnref[i]); - } } protected: @@ -58,11 +51,11 @@ protected: SkScalar w = SkIntToScalar(size.fWidth); SkScalar h = SkIntToScalar(size.fHeight); - static_assert(4 == SK_ARRAY_COUNT(fTypefacesToUnref), "typeface_cnt"); - fTypefacesToUnref[0] = sk_tool_utils::create_portable_typeface("sans-serif", SkTypeface::kNormal); - fTypefacesToUnref[1] = sk_tool_utils::create_portable_typeface("sans-serif", SkTypeface::kBold); - fTypefacesToUnref[2] = sk_tool_utils::create_portable_typeface("serif", SkTypeface::kNormal); - fTypefacesToUnref[3] = sk_tool_utils::create_portable_typeface("serif", SkTypeface::kBold); + static_assert(4 == SK_ARRAY_COUNT(fTypefaces), "typeface_cnt"); + fTypefaces[0] = sk_tool_utils::create_portable_typeface("sans-serif", SkTypeface::kNormal); + fTypefaces[1] = sk_tool_utils::create_portable_typeface("sans-serif", SkTypeface::kBold); + fTypefaces[2] = sk_tool_utils::create_portable_typeface("serif", SkTypeface::kNormal); + fTypefaces[3] = sk_tool_utils::create_portable_typeface("serif", SkTypeface::kBold); SkRandom random; for (int i = 0; i < kCnt; ++i) { @@ -82,12 +75,11 @@ protected: fPtSizes[i] = random.nextRangeScalar(kMinPtSize, kMaxPtSize); - fTypefaces[i] = fTypefacesToUnref[ - random.nextULessThan(SK_ARRAY_COUNT(fTypefacesToUnref))]; + fTypefaceIndices[i] = random.nextULessThan(SK_ARRAY_COUNT(fTypefaces)); SkRect r; fPaint.setColor(fColors[i]); - fPaint.setTypeface(fTypefaces[i]); + fPaint.setTypeface(fTypefaces[fTypefaceIndices[i]]); fPaint.setTextSize(fPtSizes[i]); fPaint.measureText(fStrings[i].c_str(), fStrings[i].size(), &r); @@ -116,7 +108,7 @@ protected: for (int i = 0; i < kCnt; ++i) { fPaint.setColor(fColors[i]); fPaint.setTextSize(fPtSizes[i]); - fPaint.setTypeface(fTypefaces[i]); + fPaint.setTypeface(fTypefaces[fTypefaceIndices[i]]); canvas->save(); canvas->clipRect(fClipRects[i]); @@ -146,14 +138,14 @@ private: bool fEffectiveClip; bool fLCD; - SkTypeface* fTypefacesToUnref[4]; + sk_sp<SkTypeface> fTypefaces[4]; SkPaint fPaint; // precomputed for each text draw SkString fStrings[kCnt]; SkColor fColors[kCnt]; SkScalar fPtSizes[kCnt]; - SkTypeface* fTypefaces[kCnt]; + int fTypefaceIndices[kCnt]; SkPoint fPositions[kCnt]; SkRect fClipRects[kCnt]; |