aboutsummaryrefslogtreecommitdiffhomepage
path: root/gm/glyph_pos.cpp
diff options
context:
space:
mode:
authorGravatar Mike Reed <reed@google.com>2017-02-22 13:21:42 -0500
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-02-22 19:41:04 +0000
commit3661bc997620899695041010a750d11dbe8a972d (patch)
treea3607cc09eaefdc85b6f3d511b8f9632b680dd95 /gm/glyph_pos.cpp
parent2b767361de00fd85cb32dce62c4a95d30b7eaabf (diff)
hide trivial helpers on canvas
BUG=skia: Change-Id: I42d4ca92897bde5bd8e0575a0104b12b83134cef Reviewed-on: https://skia-review.googlesource.com/8852 Reviewed-by: Cary Clark <caryclark@google.com> Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'gm/glyph_pos.cpp')
-rw-r--r--gm/glyph_pos.cpp94
1 files changed, 47 insertions, 47 deletions
diff --git a/gm/glyph_pos.cpp b/gm/glyph_pos.cpp
index 7628fbe298..b89077aad3 100644
--- a/gm/glyph_pos.cpp
+++ b/gm/glyph_pos.cpp
@@ -26,53 +26,53 @@ static void draw_gm(SkCanvas* canvas,
SkScalar strokeWidth,
SkPaint::Style strokeStyle) {
// There's a black pixel at 40, 40 for reference.
- canvas->drawPoint(40.0f, 40.0f, SK_ColorBLACK);
-
- // Two reference images.
- canvas->translate(50.0f, 50.0f);
- drawTestCase(canvas, 1.0f, strokeWidth, strokeStyle);
-
- canvas->translate(0.0f, 50.0f);
- drawTestCase(canvas, 3.0f, strokeWidth, strokeStyle);
-
- // Uniform scaling test.
- canvas->translate(0.0f, 100.0f);
- canvas->save();
- canvas->scale(3.0f, 3.0f);
- drawTestCase(canvas, 1.0f, strokeWidth, strokeStyle);
- canvas->restore();
-
- // Non-uniform scaling test.
- canvas->translate(0.0f, 100.0f);
- canvas->save();
- canvas->scale(3.0f, 6.0f);
- drawTestCase(canvas, 1.0f, strokeWidth, strokeStyle);
- canvas->restore();
-
- // Skew test.
- canvas->translate(0.0f, 80.0f);
- canvas->save();
- canvas->scale(3.0f, 3.0f);
- SkMatrix skew;
- skew.setIdentity();
- skew.setSkewX(8.0f / 25.0f);
- skew.setSkewY(2.0f / 25.0f);
- canvas->concat(skew);
- drawTestCase(canvas, 1.0f, strokeWidth, strokeStyle);
- canvas->restore();
-
- // Perspective test.
- canvas->translate(0.0f, 80.0f);
- canvas->save();
- SkMatrix perspective;
- perspective.setIdentity();
- perspective.setPerspX(-SkScalarInvert(340));
- perspective.setSkewX(8.0f / 25.0f);
- perspective.setSkewY(2.0f / 25.0f);
-
- canvas->concat(perspective);
- drawTestCase(canvas, 1.0f, strokeWidth, strokeStyle);
- canvas->restore();
+ canvas->drawPoint(40, 40, SkPaint());
+
+ // Two reference images.
+ canvas->translate(50.0f, 50.0f);
+ drawTestCase(canvas, 1.0f, strokeWidth, strokeStyle);
+
+ canvas->translate(0.0f, 50.0f);
+ drawTestCase(canvas, 3.0f, strokeWidth, strokeStyle);
+
+ // Uniform scaling test.
+ canvas->translate(0.0f, 100.0f);
+ canvas->save();
+ canvas->scale(3.0f, 3.0f);
+ drawTestCase(canvas, 1.0f, strokeWidth, strokeStyle);
+ canvas->restore();
+
+ // Non-uniform scaling test.
+ canvas->translate(0.0f, 100.0f);
+ canvas->save();
+ canvas->scale(3.0f, 6.0f);
+ drawTestCase(canvas, 1.0f, strokeWidth, strokeStyle);
+ canvas->restore();
+
+ // Skew test.
+ canvas->translate(0.0f, 80.0f);
+ canvas->save();
+ canvas->scale(3.0f, 3.0f);
+ SkMatrix skew;
+ skew.setIdentity();
+ skew.setSkewX(8.0f / 25.0f);
+ skew.setSkewY(2.0f / 25.0f);
+ canvas->concat(skew);
+ drawTestCase(canvas, 1.0f, strokeWidth, strokeStyle);
+ canvas->restore();
+
+ // Perspective test.
+ canvas->translate(0.0f, 80.0f);
+ canvas->save();
+ SkMatrix perspective;
+ perspective.setIdentity();
+ perspective.setPerspX(-SkScalarInvert(340));
+ perspective.setSkewX(8.0f / 25.0f);
+ perspective.setSkewY(2.0f / 25.0f);
+
+ canvas->concat(perspective);
+ drawTestCase(canvas, 1.0f, strokeWidth, strokeStyle);
+ canvas->restore();
}
static void drawTestCase(SkCanvas* canvas,