diff options
| author |  caryclark <caryclark@google.com> | 2015-07-15 05:43:38 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-07-15 05:43:38 -0700 |
| commit | 001ceb7e1b3d7e3743f021cf9e70754488833859 (patch) | |
| tree | b35a4497bc032c0438755852d9f798f43d8c59e7 /gm | |
| parent | 7e797dff24f3a256fc6e5b5d0a366fb90c93ff18 (diff) | |
remove funkster from dcshader gm
The multicolored font that funster enables
only draws and measures on some platforms.
Removing it from the dcshader gm allows
the layout to be uniform on all devices,
making it easier to compare the output
in gold.
TBR=bsalomon@google.com
Review URL: https://codereview.chromium.org/1231853004
Diffstat (limited to 'gm')
| -rw-r--r-- | gm/dcshader.cpp | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/gm/dcshader.cpp b/gm/dcshader.cpp index b26c750e9a..744ea9d65d 100644 --- a/gm/dcshader.cpp +++ b/gm/dcshader.cpp @@ -217,18 +217,6 @@ protected: virtual const char* text() const { return "Hello, Skia!"; } }; - struct BmpText : public Text { - void setFont(SkPaint* paint) override { - if (!fTypeface) { - fTypeface.reset(GetResourceAsTypeface("/fonts/Funkster.ttf")); - } - paint->setTypeface(fTypeface); - } - - const char* text() const override { return "Hi, Skia!"; } - - SkAutoTUnref<SkTypeface> fTypeface; - }; fPrims.push_back(SkNEW(Rect)); fPrims.push_back(SkNEW(Circle)); fPrims.push_back(SkNEW(RRect)); @@ -238,7 +226,6 @@ protected: fPrims.push_back(SkNEW(Points(SkCanvas::kLines_PointMode))); fPrims.push_back(SkNEW(Points(SkCanvas::kPolygon_PointMode))); fPrims.push_back(SkNEW(Text)); - fPrims.push_back(SkNEW(BmpText)); } void onDraw(SkCanvas* canvas) override { |