| Index: gm/typeface.cpp
|
| diff --git a/gm/typeface.cpp b/gm/typeface.cpp
|
| index 1606cef3cb7078db3c3e12fbf5986afcade61772..4114d2cc3344ae557568e47c7fcbc1b0baace683 100644
|
| --- a/gm/typeface.cpp
|
| +++ b/gm/typeface.cpp
|
| @@ -36,15 +36,15 @@ public:
|
| }
|
|
|
| protected:
|
| - SkString onShortName() SK_OVERRIDE {
|
| + SkString onShortName() override {
|
| return SkString("typeface");
|
| }
|
|
|
| - SkISize onISize() SK_OVERRIDE {
|
| + SkISize onISize() override {
|
| return SkISize::Make(640, 480);
|
| }
|
|
|
| - void onDraw(SkCanvas* canvas) SK_OVERRIDE {
|
| + void onDraw(SkCanvas* canvas) override {
|
| SkString text("Typefaces are fun!");
|
| SkScalar y = 0;
|
|
|
| @@ -171,7 +171,7 @@ public:
|
| }
|
|
|
| protected:
|
| - SkString onShortName() SK_OVERRIDE {
|
| + SkString onShortName() override {
|
| SkString name("typefacestyles");
|
| if (fApplyKerning) {
|
| name.append("_kerning");
|
| @@ -179,11 +179,11 @@ protected:
|
| return name;
|
| }
|
|
|
| - SkISize onISize() SK_OVERRIDE {
|
| + SkISize onISize() override {
|
| return SkISize::Make(640, 480);
|
| }
|
|
|
| - void onDraw(SkCanvas* canvas) SK_OVERRIDE {
|
| + void onDraw(SkCanvas* canvas) override {
|
| SkPaint paint;
|
| paint.setAntiAlias(true);
|
| paint.setTextSize(SkIntToScalar(30));
|
|
|