aboutsummaryrefslogtreecommitdiffstats
path: root/gm/pixelsnap.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'gm/pixelsnap.cpp')
-rw-r--r--gm/pixelsnap.cpp14
1 files changed, 5 insertions, 9 deletions
diff --git a/gm/pixelsnap.cpp b/gm/pixelsnap.cpp
index 88fa58a755..b1373b6e4b 100644
--- a/gm/pixelsnap.cpp
+++ b/gm/pixelsnap.cpp
@@ -41,10 +41,8 @@ protected:
SkString offset;
SkPaint labelPaint;
- labelPaint.setAntiAlias(true);
labelPaint.setColor(SK_ColorWHITE);
- labelPaint.setTextSize(SkIntToScalar(kLabelTextSize));
- sk_tool_utils::set_portable_typeface(&labelPaint);
+ SkFont font(sk_tool_utils::create_portable_typeface(), SkIntToScalar(kLabelTextSize));
SkPaint linePaint;
linePaint.setColor(SK_ColorWHITE);
@@ -53,9 +51,8 @@ protected:
canvas->translate(0, SkIntToScalar(kLabelOffsetY));
for (int i = 0; i <= kSubPixelSteps; ++i) {
offset.printf("%d", i);
- canvas->drawString(offset,
- 0, i * kTrans + labelPaint.getTextSize(),
- labelPaint);
+ canvas->drawString(offset, 0, i * kTrans + SkIntToScalar(kLabelTextSize),
+ font, labelPaint);
}
canvas->restore();
@@ -64,9 +61,8 @@ protected:
canvas->translate(SkIntToScalar(kLabelOffsetX), 0);
for (int i = 0; i <= kSubPixelSteps; ++i) {
offset.printf("%d", i);
- canvas->drawString(offset,
- i * SkIntToScalar(kTrans), labelPaint.getTextSize(),
- labelPaint);
+ canvas->drawString(offset, i * SkIntToScalar(kTrans), SkIntToScalar(kLabelTextSize),
+ font, labelPaint);
}
canvas->restore();