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

Side by Side Diff: gm/circularclips.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/circles.cpp ('k') | gm/clip_strokerect.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 "SkCanvas.h" 9 #include "SkCanvas.h"
10 #include "SkPath.h" 10 #include "SkPath.h"
11 11
12 class CircularClipsGM : public skiagm::GM { 12 class CircularClipsGM : public skiagm::GM {
13 SkScalar fX1, fX2, fY, fR; 13 SkScalar fX1, fX2, fY, fR;
14 SkPath fCircle1, fCircle2; 14 SkPath fCircle1, fCircle2;
15 15
16 protected: 16 protected:
17 void onOnceBeforeDraw() SK_OVERRIDE { 17 void onOnceBeforeDraw() override {
18 fX1 = 80; 18 fX1 = 80;
19 fX2 = 120; 19 fX2 = 120;
20 fY = 50; 20 fY = 50;
21 fR = 40; 21 fR = 40;
22 22
23 fCircle1.addCircle(fX1, fY, fR, SkPath::kCW_Direction); 23 fCircle1.addCircle(fX1, fY, fR, SkPath::kCW_Direction);
24 fCircle2.addCircle(fX2, fY, fR, SkPath::kCW_Direction); 24 fCircle2.addCircle(fX2, fY, fR, SkPath::kCW_Direction);
25 } 25 }
26 26
27 27
28 bool runAsBench() const SK_OVERRIDE { return true; } 28 bool runAsBench() const override { return true; }
29 29
30 SkString onShortName() SK_OVERRIDE { 30 SkString onShortName() override {
31 return SkString("circular-clips"); 31 return SkString("circular-clips");
32 } 32 }
33 33
34 SkISize onISize() SK_OVERRIDE { 34 SkISize onISize() override {
35 return SkISize::Make(800, 600); 35 return SkISize::Make(800, 600);
36 } 36 }
37 37
38 void onDraw(SkCanvas* canvas) SK_OVERRIDE { 38 void onDraw(SkCanvas* canvas) override {
39 SkRegion::Op ops[] = { 39 SkRegion::Op ops[] = {
40 SkRegion::kDifference_Op, 40 SkRegion::kDifference_Op,
41 SkRegion::kIntersect_Op, 41 SkRegion::kIntersect_Op,
42 SkRegion::kUnion_Op, 42 SkRegion::kUnion_Op,
43 SkRegion::kXOR_Op, 43 SkRegion::kXOR_Op,
44 SkRegion::kReverseDifference_Op, 44 SkRegion::kReverseDifference_Op,
45 SkRegion::kReplace_Op, 45 SkRegion::kReplace_Op,
46 }; 46 };
47 47
48 SkRect rect = SkRect::MakeLTRB(fX1 - fR, fY - fR, fX2 + fR, fY + fR); 48 SkRect rect = SkRect::MakeLTRB(fX1 - fR, fY - fR, fX2 + fR, fY + fR);
(...skipping 23 matching lines...) Expand all
72 } 72 }
73 } 73 }
74 74
75 private: 75 private:
76 typedef skiagm::GM INHERITED; 76 typedef skiagm::GM INHERITED;
77 }; 77 };
78 78
79 ////////////////////////////////////////////////////////////////////////////// 79 //////////////////////////////////////////////////////////////////////////////
80 80
81 DEF_GM( return new CircularClipsGM; ) 81 DEF_GM( return new CircularClipsGM; )
OLDNEW
« no previous file with comments | « gm/circles.cpp ('k') | gm/clip_strokerect.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698