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 /samplecode/ClockFaceView.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. 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 'samplecode/ClockFaceView.cpp')
| -rw-r--r-- | samplecode/ClockFaceView.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/samplecode/ClockFaceView.cpp b/samplecode/ClockFaceView.cpp index 7c6158ada3..6e2b2b1585 100644 --- a/samplecode/ClockFaceView.cpp +++ b/samplecode/ClockFaceView.cpp @@ -170,17 +170,21 @@ static void apply_shader(SkPaint* paint, float scale) } class ClockFaceView : public SkView { - sk_sp<SkTypeface> fFace; + SkTypeface* fFace; SkScalar fInterp; SkScalar fDx; public: ClockFaceView() { - fFace = SkTypeface::MakeFromFile("/Users/reed/Downloads/p052024l.pfb"); + fFace = SkTypeface::CreateFromFile("/Users/reed/Downloads/p052024l.pfb"); fInterp = 0; fDx = SK_Scalar1/64; } + virtual ~ClockFaceView() { + SkSafeUnref(fFace); + } + protected: // overrides from SkEventSink virtual bool onQuery(SkEvent* evt) { @@ -221,7 +225,8 @@ protected: paint.setAntiAlias(true); paint.setTextSize(SkIntToScalar(240)); - paint.setTypeface(SkTypeface::MakeFromName("sans-serif", SkTypeface::kBold)); + paint.setTypeface(SkTypeface::CreateFromName("sans-serif", + SkTypeface::kBold)); SkString str("9"); |