rename portable_typeface_always to portable_typeface

gm/pixelsnap.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "gm.h"
 
 #include "SkShader.h"
@@ skipping 25 matching lines @@
         SkPaint bgPaint;
         bgPaint.setShader(
             sk_tool_utils::create_checkerboard_shader(0xFFAAAAAA, 0xFF777777, 1))->unref();
         canvas->drawPaint(bgPaint);
 
         SkString offset;
         SkPaint labelPaint;
         labelPaint.setAntiAlias(true);
         labelPaint.setColor(SK_ColorWHITE);
         labelPaint.setTextSize(SkIntToScalar(kLabelTextSize));
+        sk_tool_utils::set_portable_typeface(&labelPaint);
         SkPaint linePaint;
         linePaint.setColor(SK_ColorWHITE);
 
-        // Drawing labels is useful for debugging, but bad for baselining (x-platform txt diffs).
-        if (false) {
-            // Draw row labels
-            canvas->save();
-                canvas->translate(0, SkIntToScalar(kLabelOffsetY));
-                for (int i = 0; i <= kSubPixelSteps; ++i) {
-                    offset.printf("%d", i);
-                    canvas->drawText(offset.c_str(), offset.size(),
-                                     0, i * kTrans + labelPaint.getTextSize(),
-                                     labelPaint);
-                }
-            canvas->restore();
+        // Draw row labels
+        canvas->save();
+            canvas->translate(0, SkIntToScalar(kLabelOffsetY));
+            for (int i = 0; i <= kSubPixelSteps; ++i) {
+                offset.printf("%d", i);
+                canvas->drawText(offset.c_str(), offset.size(),
+                                    0, i * kTrans + labelPaint.getTextSize(),
+                                    labelPaint);
+            }
+        canvas->restore();
 
-            // Draw col labels
-            canvas->save();
-                canvas->translate(SkIntToScalar(kLabelOffsetX), 0);
-                for (int i = 0; i <= kSubPixelSteps; ++i) {
-                    offset.printf("%d", i);
-                    canvas->drawText(offset.c_str(), offset.size(),
-                                     i * SkIntToScalar(kTrans), labelPaint.getTextSize(),
-                                     labelPaint);
-                }
-            canvas->restore();
-        }
+        // Draw col labels
+        canvas->save();
+            canvas->translate(SkIntToScalar(kLabelOffsetX), 0);
+            for (int i = 0; i <= kSubPixelSteps; ++i) {
+                offset.printf("%d", i);
+                canvas->drawText(offset.c_str(), offset.size(),
+                                    i * SkIntToScalar(kTrans), labelPaint.getTextSize(),
+                                    labelPaint);
+            }
+        canvas->restore();
 
         canvas->translate(SkIntToScalar(kLabelOffsetX), SkIntToScalar(kLabelOffsetY));
 
         // Draw test case grid lines (Draw them all at pixel centers to hopefully avoid any
         // snapping issues).
         for (int i = 0; i <= kSubPixelSteps + 1; ++i) {
             canvas->drawLine(0.5f,
                              i * SkIntToScalar(kTrans) + 0.5f,
                              SkIntToScalar(kTrans) * (kSubPixelSteps + 1) + 0.5f,
                              i * SkIntToScalar(kTrans) + 0.5f,
@@ skipping 89 matching lines @@
 
 private:
     typedef PixelSnapGM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 DEF_GM( return SkNEW(PointSnapGM); )
 DEF_GM( return SkNEW(LineSnapGM); )
 DEF_GM( return SkNEW(RectSnapGM); )
 DEF_GM( return SkNEW(ComboSnapGM); )