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

Side by Side Diff: gm/rects.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/quadpaths.cpp ('k') | gm/roundrects.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 * Copyright 2013 Google Inc. 2 * Copyright 2013 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #include "gm.h" 8 #include "gm.h"
9 #include "SkBlurDrawLooper.h" 9 #include "SkBlurDrawLooper.h"
10 #include "SkBlurMask.h" 10 #include "SkBlurMask.h"
11 #include "SkBlurMaskFilter.h" 11 #include "SkBlurMaskFilter.h"
12 #include "SkGradientShader.h" 12 #include "SkGradientShader.h"
13 #include "SkMatrix.h" 13 #include "SkMatrix.h"
14 #include "SkTArray.h" 14 #include "SkTArray.h"
15 15
16 namespace skiagm { 16 namespace skiagm {
17 17
18 class RectsGM : public GM { 18 class RectsGM : public GM {
19 public: 19 public:
20 RectsGM() { 20 RectsGM() {
21 this->setBGColor(0xFF000000); 21 this->setBGColor(0xFF000000);
22 this->makePaints(); 22 this->makePaints();
23 this->makeMatrices(); 23 this->makeMatrices();
24 this->makeRects(); 24 this->makeRects();
25 } 25 }
26 26
27 protected: 27 protected:
28 28
29 SkString onShortName() SK_OVERRIDE { 29 SkString onShortName() override {
30 return SkString("rects"); 30 return SkString("rects");
31 } 31 }
32 32
33 SkISize onISize() SK_OVERRIDE { 33 SkISize onISize() override {
34 return SkISize::Make(1200, 900); 34 return SkISize::Make(1200, 900);
35 } 35 }
36 36
37 void makePaints() { 37 void makePaints() {
38 { 38 {
39 // no AA 39 // no AA
40 SkPaint p; 40 SkPaint p;
41 p.setColor(SK_ColorWHITE); 41 p.setColor(SK_ColorWHITE);
42 fPaints.push_back(p); 42 fPaints.push_back(p);
43 } 43 }
(...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after
244 fRects.push_back(r); 244 fRects.push_back(r);
245 } 245 }
246 } 246 }
247 247
248 // position the current test on the canvas 248 // position the current test on the canvas
249 static void position(SkCanvas* canvas, int testCount) { 249 static void position(SkCanvas* canvas, int testCount) {
250 canvas->translate(SK_Scalar1 * 100 * (testCount % 10) + SK_Scalar1 / 4, 250 canvas->translate(SK_Scalar1 * 100 * (testCount % 10) + SK_Scalar1 / 4,
251 SK_Scalar1 * 100 * (testCount / 10) + 3 * SK_Scalar1 / 4); 251 SK_Scalar1 * 100 * (testCount / 10) + 3 * SK_Scalar1 / 4);
252 } 252 }
253 253
254 void onDraw(SkCanvas* canvas) SK_OVERRIDE { 254 void onDraw(SkCanvas* canvas) override {
255 SkAutoCommentBlock acb(canvas, "onDraw"); 255 SkAutoCommentBlock acb(canvas, "onDraw");
256 256
257 canvas->translate(20 * SK_Scalar1, 20 * SK_Scalar1); 257 canvas->translate(20 * SK_Scalar1, 20 * SK_Scalar1);
258 258
259 int testCount = 0; 259 int testCount = 0;
260 260
261 canvas->addComment("Test", "Various Paints"); 261 canvas->addComment("Test", "Various Paints");
262 262
263 for (int i = 0; i < fPaints.count(); ++i) { 263 for (int i = 0; i < fPaints.count(); ++i) {
264 for (int j = 0; j < fRects.count(); ++j, ++testCount) { 264 for (int j = 0; j < fRects.count(); ++j, ++testCount) {
(...skipping 28 matching lines...) Expand all
293 293
294 typedef GM INHERITED; 294 typedef GM INHERITED;
295 }; 295 };
296 296
297 ////////////////////////////////////////////////////////////////////////////// 297 //////////////////////////////////////////////////////////////////////////////
298 298
299 static GM* MyFactory(void*) { return new RectsGM; } 299 static GM* MyFactory(void*) { return new RectsGM; }
300 static GMRegistry reg(MyFactory); 300 static GMRegistry reg(MyFactory);
301 301
302 } 302 }
OLDNEW
« no previous file with comments | « gm/quadpaths.cpp ('k') | gm/roundrects.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698