Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3149)

Unified Diff: gm/dcshader.cpp

Issue 1231853004: remove funkster from dcshader gm (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gm/dcshader.cpp
diff --git a/gm/dcshader.cpp b/gm/dcshader.cpp
index b26c750e9a3083f38ffc0645b7fafcbb8882ab34..744ea9d65d9b08c8bfecab5333a8454e6beac68b 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 {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698