aboutsummaryrefslogtreecommitdiffhomepage
path: root/gm/tilemodes_scaled.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'gm/tilemodes_scaled.cpp')
-rw-r--r--gm/tilemodes_scaled.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/gm/tilemodes_scaled.cpp b/gm/tilemodes_scaled.cpp
index a8227a005b..efb6f8537a 100644
--- a/gm/tilemodes_scaled.cpp
+++ b/gm/tilemodes_scaled.cpp
@@ -65,7 +65,7 @@ protected:
kNPOTSize = 3,
};
- SkString onShortName() SK_OVERRIDE {
+ SkString onShortName() override {
SkString name("scaled_tilemodes");
if (!fPowerOfTwoSize) {
name.append("_npot");
@@ -73,16 +73,16 @@ protected:
return name;
}
- SkISize onISize() SK_OVERRIDE { return SkISize::Make(880, 760); }
+ SkISize onISize() override { return SkISize::Make(880, 760); }
- void onOnceBeforeDraw() SK_OVERRIDE {
+ void onOnceBeforeDraw() override {
int size = fPowerOfTwoSize ? kPOTSize : kNPOTSize;
for (size_t i = 0; i < SK_ARRAY_COUNT(gColorTypes); i++) {
makebm(&fTexture[i], gColorTypes[i], size, size);
}
}
- void onDraw(SkCanvas* canvas) SK_OVERRIDE {
+ void onDraw(SkCanvas* canvas) override {
float scale = 32.f/kPOTSize;
int size = fPowerOfTwoSize ? kPOTSize : kNPOTSize;
@@ -207,13 +207,13 @@ public:
protected:
- SkString onShortName() SK_OVERRIDE {
+ SkString onShortName() override {
return fName;
}
- SkISize onISize() SK_OVERRIDE { return SkISize::Make(880, 560); }
+ SkISize onISize() override { return SkISize::Make(880, 560); }
- void onDraw(SkCanvas* canvas) SK_OVERRIDE {
+ void onDraw(SkCanvas* canvas) override {
canvas->scale(SkIntToScalar(3)/2, SkIntToScalar(3)/2);
const SkScalar w = SkIntToScalar(gWidth);