| Index: gm/dftext.cpp
|
| diff --git a/gm/dftext.cpp b/gm/dftext.cpp
|
| index f3d39e527c06523cffb3fd4f03b0f32f8b657c35..314ee71389942ed9100b1ab4b79b75cd666db968 100755
|
| --- a/gm/dftext.cpp
|
| +++ b/gm/dftext.cpp
|
| @@ -23,7 +23,7 @@ public:
|
| }
|
|
|
| protected:
|
| - void onOnceBeforeDraw() SK_OVERRIDE {
|
| + void onOnceBeforeDraw() override {
|
| SkString filename = GetResourcePath("/Funkster.ttf");
|
| SkAutoTDelete<SkFILEStream> stream(new SkFILEStream(filename.c_str()));
|
| if (!stream->isValid()) {
|
| @@ -34,11 +34,11 @@ protected:
|
| fTypeface = SkTypeface::CreateFromStream(stream.detach());
|
| }
|
|
|
| - SkString onShortName() SK_OVERRIDE {
|
| + SkString onShortName() override {
|
| return SkString("dftext");
|
| }
|
|
|
| - SkISize onISize() SK_OVERRIDE {
|
| + SkISize onISize() override {
|
| return SkISize::Make(1024, 768);
|
| }
|
|
|
| @@ -50,7 +50,7 @@ protected:
|
| canvas->translate(-px, -py);
|
| }
|
|
|
| - virtual void onDraw(SkCanvas* inputCanvas) SK_OVERRIDE {
|
| + virtual void onDraw(SkCanvas* inputCanvas) override {
|
| #ifdef SK_BUILD_FOR_ANDROID
|
| SkScalar textSizes[] = { 9.0f, 9.0f*2.0f, 9.0f*5.0f, 9.0f*2.0f*5.0f };
|
| #else
|
|
|