diff options
| author |  bungeman <bungeman@google.com> | 2016-05-12 10:09:30 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-05-12 10:09:31 -0700 |
| commit | 13b9c95295f4c5732e34574789e721a6bc08f7b4 (patch) | |
| tree | c3ef0aa2af9890c03cb79968f32166af39fba9ba /gm/gammatext.cpp | |
| parent | 40d21de8b6620d724f34bdc85af1dcb593d33fe0 (diff) | |
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
Diffstat (limited to 'gm/gammatext.cpp')
| -rw-r--r-- | gm/gammatext.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/gm/gammatext.cpp b/gm/gammatext.cpp index bc5feb3375..c7d4309f97 100644 --- a/gm/gammatext.cpp +++ b/gm/gammatext.cpp @@ -19,12 +19,8 @@ static sk_sp<SkShader> make_heatGradient(const SkPoint pts[2]) { } static bool setFont(SkPaint* paint, const char name[]) { - SkTypeface* tf = SkTypeface::CreateFromName(name, SkTypeface::kNormal); - if (tf) { - paint->setTypeface(tf)->unref(); - return true; - } - return false; + paint->setTypeface(SkTypeface::MakeFromName(name, SkTypeface::kNormal)); + return SkToBool(paint->getTypeface()); } /** @@ -108,8 +104,7 @@ static sk_sp<SkShader> make_gradient(SkColor c) { } static void set_face(SkPaint* paint) { - SkTypeface* face = SkTypeface::CreateFromName("serif", SkTypeface::kItalic); - SkSafeUnref(paint->setTypeface(face)); + paint->setTypeface(SkTypeface::MakeFromName("serif", SkTypeface::kItalic)); } static void draw_pair(SkCanvas* canvas, SkPaint* paint, const sk_sp<SkShader>& shader) { |