| commit | 13b9c95295f4c5732e34574789e721a6bc08f7b4 | [log] [tgz] |
|---|---|---|
| author | bungeman <bungeman@google.com> | Thu May 12 10:09:30 2016 -0700 |
| committer | Commit bot <commit-bot@chromium.org> | Thu May 12 10:09:31 2016 -0700 |
| tree | c3ef0aa2af9890c03cb79968f32166af39fba9ba | |
| parent | 40d21de8b6620d724f34bdc85af1dcb593d33fe0 [diff] [blame] |
Move SkTypeface to sk_sp. Committed: https://skia.googlesource.com/skia/+/6296da736fbf40aae881650c239420f64e576c3f GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1933393002 Review-Url: https://codereview.chromium.org/1933393002
diff --git a/samplecode/ClockFaceView.cpp b/samplecode/ClockFaceView.cpp index 6e2b2b1..7c6158a 100644 --- a/samplecode/ClockFaceView.cpp +++ b/samplecode/ClockFaceView.cpp
@@ -170,21 +170,17 @@ } class ClockFaceView : public SkView { - SkTypeface* fFace; + sk_sp<SkTypeface> fFace; SkScalar fInterp; SkScalar fDx; public: ClockFaceView() { - fFace = SkTypeface::CreateFromFile("/Users/reed/Downloads/p052024l.pfb"); + fFace = SkTypeface::MakeFromFile("/Users/reed/Downloads/p052024l.pfb"); fInterp = 0; fDx = SK_Scalar1/64; } - virtual ~ClockFaceView() { - SkSafeUnref(fFace); - } - protected: // overrides from SkEventSink virtual bool onQuery(SkEvent* evt) { @@ -225,8 +221,7 @@ paint.setAntiAlias(true); paint.setTextSize(SkIntToScalar(240)); - paint.setTypeface(SkTypeface::CreateFromName("sans-serif", - SkTypeface::kBold)); + paint.setTypeface(SkTypeface::MakeFromName("sans-serif", SkTypeface::kBold)); SkString str("9");