commit ef14cb397cca75607019e2cc401d4bb9969ed105
author caryclark <caryclark@google.com> Thu Jul 16 14:16:04 2015 -0700
committer Commit bot <commit-bot@chromium.org> Thu Jul 16 14:16:04 2015 -0700
tree 4af9b4ab7579235f79dc6cb5643240e75b2e51f4
parent 31b21f67190916b94c5345126ddab327a8feac57

make glyph_pos imageblur* largeglyphblur portable

R=reed@google.com,bungeman@google.com

Review URL: https://codereview.chromium.org/1243493003

gm/glyph_pos.cpp

diff --git a/gm/glyph_pos.cpp b/gm/glyph_pos.cpp
index 16cdfca..90329ed 100644
--- a/gm/glyph_pos.cpp
+++ b/gm/glyph_pos.cpp
@@ -48,9 +48,6 @@
     SkISize onISize() override { return SkISize::Make(800, 600); }
 
     void onDraw(SkCanvas* canvas) override {
-        if (!fProp) {
-            fProp.reset(sk_tool_utils::create_portable_typeface("Helvetica", SkTypeface::kNormal));
-        }
 
         // There's a black pixel at 40, 40 for reference.
         canvas->drawPoint(40.0f, 40.0f, SK_ColorBLACK);
@@ -108,8 +105,7 @@
         paint.setColor(SK_ColorBLACK);
         paint.setAntiAlias(true);
         paint.setTextSize(kTextHeight * textScale);
-        paint.setTypeface(fProp);
-        paint.setDevKernText(true);
+        sk_tool_utils::set_portable_typeface_always(&paint);
         paint.setStrokeWidth(fStrokeWidth);
         paint.setStyle(fStrokeStyle);
 
@@ -158,7 +154,6 @@
     }
 
 private:
-    SkAutoTUnref<SkTypeface> fProp;
     SkScalar fStrokeWidth;
     SkPaint::Style fStrokeStyle;