diff options
| author |  scroggo <scroggo@google.com> | 2016-05-12 06:22:30 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-05-12 06:22:30 -0700 |
| commit | 9a9a7b29e5e5916a7b6453cd124ca437f14b9da4 (patch) | |
| tree | ad5b560f6ed5da12040e5665282fd2227c305ff8 /bench/TextBlobBench.cpp | |
| parent | a1b283345b27fef91908b104a30cb89e6fbdaade (diff) | |
Revert of Move SkTypeface to sk_sp. (patchset #5 id:80001 of https://codereview.chromium.org/1933393002/ )
Reason for revert:
fontmgr_iterAndroid failing to draw emoji. E.g. 6296da736fbf40aae881650c239420f64e576c3f&unt=true&head=true&query=source_type%3Dgm">https://gold.skia.org/search2?blame=6296da736fbf40aae881650c239420f64e576c3f&unt=true&head=true&query=source_type%3Dgm
Original issue's description:
> Move SkTypeface to sk_sp.
>
> Committed: https://skia.googlesource.com/skia/+/6296da736fbf40aae881650c239420f64e576c3f
TBR=reed@google.com,fmalita@chromium.org,tomhudson@google.com,bungeman@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review-Url: https://codereview.chromium.org/1974783002
Diffstat (limited to 'bench/TextBlobBench.cpp')
| -rw-r--r-- | bench/TextBlobBench.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/bench/TextBlobBench.cpp b/bench/TextBlobBench.cpp index 37bf311119..a350e7b4c4 100644 --- a/bench/TextBlobBench.cpp +++ b/bench/TextBlobBench.cpp @@ -23,11 +23,13 @@ */ class TextBlobBench : public Benchmark { public: - TextBlobBench() {} + TextBlobBench() + : fTypeface(nullptr) { + } protected: void onDelayedSetup() override { - fTypeface = sk_tool_utils::create_portable_typeface("serif", SkTypeface::kNormal); + fTypeface.reset(sk_tool_utils::create_portable_typeface("serif", SkTypeface::kNormal)); // make textblob SkPaint paint; paint.setTypeface(fTypeface); @@ -62,9 +64,9 @@ protected: private: - SkAutoTUnref<const SkTextBlob> fBlob; - SkTDArray<uint16_t> fGlyphs; - sk_sp<SkTypeface> fTypeface; + SkAutoTUnref<const SkTextBlob> fBlob; + SkTDArray<uint16_t> fGlyphs; + SkAutoTUnref<SkTypeface> fTypeface; typedef Benchmark INHERITED; }; |