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

Side by Side Diff: gm/filltypes.cpp

Issue 1037793002: C++11 override should now be supported by all of {bots,Chrome,Android,Mozilla} (Closed) Base URL: https://skia.googlesource.com/skia@master
Patch Set: git cl web Created 5 years, 9 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 unified diff | Download patch
« no previous file with comments | « gm/factory.cpp ('k') | gm/filltypespersp.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 1
2 /* 2 /*
3 * Copyright 2011 Google Inc. 3 * Copyright 2011 Google Inc.
4 * 4 *
5 * Use of this source code is governed by a BSD-style license that can be 5 * Use of this source code is governed by a BSD-style license that can be
6 * found in the LICENSE file. 6 * found in the LICENSE file.
7 */ 7 */
8 #include "gm.h" 8 #include "gm.h"
9 9
10 namespace skiagm { 10 namespace skiagm {
11 11
12 class FillTypeGM : public GM { 12 class FillTypeGM : public GM {
13 SkPath fPath; 13 SkPath fPath;
14 public: 14 public:
15 FillTypeGM() { 15 FillTypeGM() {
16 this->setBGColor(0xFFDDDDDD); 16 this->setBGColor(0xFFDDDDDD);
17 } 17 }
18 18
19 void makePath() { 19 void makePath() {
20 if (fPath.isEmpty()) { 20 if (fPath.isEmpty()) {
21 const SkScalar radius = SkIntToScalar(45); 21 const SkScalar radius = SkIntToScalar(45);
22 fPath.addCircle(SkIntToScalar(50), SkIntToScalar(50), radius); 22 fPath.addCircle(SkIntToScalar(50), SkIntToScalar(50), radius);
23 fPath.addCircle(SkIntToScalar(100), SkIntToScalar(100), radius); 23 fPath.addCircle(SkIntToScalar(100), SkIntToScalar(100), radius);
24 } 24 }
25 } 25 }
26 26
27 protected: 27 protected:
28 28
29 SkString onShortName() SK_OVERRIDE { 29 SkString onShortName() override {
30 return SkString("filltypes"); 30 return SkString("filltypes");
31 } 31 }
32 32
33 SkISize onISize() SK_OVERRIDE { 33 SkISize onISize() override {
34 return SkISize::Make(835, 840); 34 return SkISize::Make(835, 840);
35 } 35 }
36 36
37 void showPath(SkCanvas* canvas, int x, int y, SkPath::FillType ft, 37 void showPath(SkCanvas* canvas, int x, int y, SkPath::FillType ft,
38 SkScalar scale, const SkPaint& paint) { 38 SkScalar scale, const SkPaint& paint) {
39 const SkRect r = { 0, 0, SkIntToScalar(150), SkIntToScalar(150) }; 39 const SkRect r = { 0, 0, SkIntToScalar(150), SkIntToScalar(150) };
40 40
41 canvas->save(); 41 canvas->save();
42 canvas->translate(SkIntToScalar(x), SkIntToScalar(y)); 42 canvas->translate(SkIntToScalar(x), SkIntToScalar(y));
43 canvas->clipRect(r); 43 canvas->clipRect(r);
(...skipping 10 matching lines...) Expand all
54 showPath(canvas, 0, 0, SkPath::kWinding_FillType, 54 showPath(canvas, 0, 0, SkPath::kWinding_FillType,
55 scale, paint); 55 scale, paint);
56 showPath(canvas, 200, 0, SkPath::kEvenOdd_FillType, 56 showPath(canvas, 200, 0, SkPath::kEvenOdd_FillType,
57 scale, paint); 57 scale, paint);
58 showPath(canvas, 00, 200, SkPath::kInverseWinding_FillType, 58 showPath(canvas, 00, 200, SkPath::kInverseWinding_FillType,
59 scale, paint); 59 scale, paint);
60 showPath(canvas, 200, 200, SkPath::kInverseEvenOdd_FillType, 60 showPath(canvas, 200, 200, SkPath::kInverseEvenOdd_FillType,
61 scale, paint); 61 scale, paint);
62 } 62 }
63 63
64 void onDraw(SkCanvas* canvas) SK_OVERRIDE { 64 void onDraw(SkCanvas* canvas) override {
65 this->makePath(); 65 this->makePath();
66 66
67 canvas->translate(SkIntToScalar(20), SkIntToScalar(20)); 67 canvas->translate(SkIntToScalar(20), SkIntToScalar(20));
68 68
69 SkPaint paint; 69 SkPaint paint;
70 const SkScalar scale = SkIntToScalar(5)/4; 70 const SkScalar scale = SkIntToScalar(5)/4;
71 71
72 paint.setAntiAlias(false); 72 paint.setAntiAlias(false);
73 73
74 showFour(canvas, SK_Scalar1, paint); 74 showFour(canvas, SK_Scalar1, paint);
(...skipping 11 matching lines...) Expand all
86 private: 86 private:
87 typedef GM INHERITED; 87 typedef GM INHERITED;
88 }; 88 };
89 89
90 ////////////////////////////////////////////////////////////////////////////// 90 //////////////////////////////////////////////////////////////////////////////
91 91
92 static GM* MyFactory(void*) { return new FillTypeGM; } 92 static GM* MyFactory(void*) { return new FillTypeGM; }
93 static GMRegistry reg(MyFactory); 93 static GMRegistry reg(MyFactory);
94 94
95 } 95 }
OLDNEW
« no previous file with comments | « gm/factory.cpp ('k') | gm/filltypespersp.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698