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

Side by Side Diff: gm/strokerects.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/strokerect.cpp ('k') | gm/strokes.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 8
9 9
10 10
11 #include "gm.h" 11 #include "gm.h"
12 #include "SkRandom.h" 12 #include "SkRandom.h"
13 13
14 namespace skiagm { 14 namespace skiagm {
15 15
16 #define W 400 16 #define W 400
17 #define H 400 17 #define H 400
18 #define N 100 18 #define N 100
19 19
20 static const SkScalar SW = SkIntToScalar(W); 20 static const SkScalar SW = SkIntToScalar(W);
21 static const SkScalar SH = SkIntToScalar(H); 21 static const SkScalar SH = SkIntToScalar(H);
22 22
23 class StrokeRectsGM : public GM { 23 class StrokeRectsGM : public GM {
24 public: 24 public:
25 StrokeRectsGM() {} 25 StrokeRectsGM() {}
26 26
27 protected: 27 protected:
28 28
29 SkString onShortName() SK_OVERRIDE { 29 SkString onShortName() override {
30 return SkString("strokerects"); 30 return SkString("strokerects");
31 } 31 }
32 32
33 SkISize onISize() SK_OVERRIDE { 33 SkISize onISize() override {
34 return SkISize::Make(W*2, H*2); 34 return SkISize::Make(W*2, H*2);
35 } 35 }
36 36
37 static void rnd_rect(SkRect* r, SkRandom& rand) { 37 static void rnd_rect(SkRect* r, SkRandom& rand) {
38 SkScalar x = rand.nextUScalar1() * W; 38 SkScalar x = rand.nextUScalar1() * W;
39 SkScalar y = rand.nextUScalar1() * H; 39 SkScalar y = rand.nextUScalar1() * H;
40 SkScalar w = rand.nextUScalar1() * (W >> 2); 40 SkScalar w = rand.nextUScalar1() * (W >> 2);
41 SkScalar h = rand.nextUScalar1() * (H >> 2); 41 SkScalar h = rand.nextUScalar1() * (H >> 2);
42 SkScalar hoffset = rand.nextSScalar1(); 42 SkScalar hoffset = rand.nextSScalar1();
43 SkScalar woffset = rand.nextSScalar1(); 43 SkScalar woffset = rand.nextSScalar1();
44 44
45 r->set(x, y, x + w, y + h); 45 r->set(x, y, x + w, y + h);
46 r->offset(-w/2 + woffset, -h/2 + hoffset); 46 r->offset(-w/2 + woffset, -h/2 + hoffset);
47 } 47 }
48 48
49 void onDraw(SkCanvas* canvas) SK_OVERRIDE { 49 void onDraw(SkCanvas* canvas) override {
50 SkPaint paint; 50 SkPaint paint;
51 paint.setStyle(SkPaint::kStroke_Style); 51 paint.setStyle(SkPaint::kStroke_Style);
52 52
53 for (int y = 0; y < 2; y++) { 53 for (int y = 0; y < 2; y++) {
54 paint.setAntiAlias(!!y); 54 paint.setAntiAlias(!!y);
55 for (int x = 0; x < 2; x++) { 55 for (int x = 0; x < 2; x++) {
56 paint.setStrokeWidth(x * SkIntToScalar(3)); 56 paint.setStrokeWidth(x * SkIntToScalar(3));
57 57
58 SkAutoCanvasRestore acr(canvas, true); 58 SkAutoCanvasRestore acr(canvas, true);
59 canvas->translate(SW * x, SH * y); 59 canvas->translate(SW * x, SH * y);
(...skipping 15 matching lines...) Expand all
75 private: 75 private:
76 typedef GM INHERITED; 76 typedef GM INHERITED;
77 }; 77 };
78 78
79 ////////////////////////////////////////////////////////////////////////////// 79 //////////////////////////////////////////////////////////////////////////////
80 80
81 static GM* MyFactory(void*) { return new StrokeRectsGM; } 81 static GM* MyFactory(void*) { return new StrokeRectsGM; }
82 static GMRegistry reg(MyFactory); 82 static GMRegistry reg(MyFactory);
83 83
84 } 84 }
OLDNEW
« no previous file with comments | « gm/strokerect.cpp ('k') | gm/strokes.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698