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

Side by Side Diff: gm/imageblur2.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/imageblur.cpp ('k') | gm/imagefiltersbase.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 2011 Google Inc. 2 * Copyright 2011 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 "SkBlurImageFilter.h" 9 #include "SkBlurImageFilter.h"
10 #include "SkRandom.h" 10 #include "SkRandom.h"
(...skipping 19 matching lines...) Expand all
30 30
31 class BlurImageFilter : public GM { 31 class BlurImageFilter : public GM {
32 public: 32 public:
33 BlurImageFilter() { 33 BlurImageFilter() {
34 this->setBGColor(0xFFFFFFFF); 34 this->setBGColor(0xFFFFFFFF);
35 fName.printf("imageblur2"); 35 fName.printf("imageblur2");
36 } 36 }
37 37
38 protected: 38 protected:
39 39
40 SkString onShortName() SK_OVERRIDE { 40 SkString onShortName() override {
41 return fName; 41 return fName;
42 } 42 }
43 43
44 SkISize onISize() SK_OVERRIDE { 44 SkISize onISize() override {
45 return SkISize::Make(WIDTH, HEIGHT); 45 return SkISize::Make(WIDTH, HEIGHT);
46 } 46 }
47 47
48 void onDraw(SkCanvas* canvas) SK_OVERRIDE { 48 void onDraw(SkCanvas* canvas) override {
49 const int sigmaCount = SK_ARRAY_COUNT(kBlurSigmas); 49 const int sigmaCount = SK_ARRAY_COUNT(kBlurSigmas);
50 const int testStringCount = SK_ARRAY_COUNT(kTestStrings); 50 const int testStringCount = SK_ARRAY_COUNT(kTestStrings);
51 SkScalar dx = WIDTH / sigmaCount; 51 SkScalar dx = WIDTH / sigmaCount;
52 SkScalar dy = HEIGHT / sigmaCount; 52 SkScalar dy = HEIGHT / sigmaCount;
53 const SkScalar textSize = 12; 53 const SkScalar textSize = 12;
54 54
55 for (int x = 0; x < sigmaCount; x++) { 55 for (int x = 0; x < sigmaCount; x++) {
56 SkScalar sigmaX = kBlurSigmas[x]; 56 SkScalar sigmaX = kBlurSigmas[x];
57 for (int y = 0; y < sigmaCount; y++) { 57 for (int y = 0; y < sigmaCount; y++) {
58 SkScalar sigmaY = kBlurSigmas[y]; 58 SkScalar sigmaY = kBlurSigmas[y];
(...skipping 25 matching lines...) Expand all
84 84
85 typedef GM INHERITED; 85 typedef GM INHERITED;
86 }; 86 };
87 87
88 ////////////////////////////////////////////////////////////////////////////// 88 //////////////////////////////////////////////////////////////////////////////
89 89
90 static GM* MyFactory(void*) { return new BlurImageFilter; } 90 static GM* MyFactory(void*) { return new BlurImageFilter; }
91 static GMRegistry reg(MyFactory); 91 static GMRegistry reg(MyFactory);
92 92
93 } 93 }
OLDNEW
« no previous file with comments | « gm/imageblur.cpp ('k') | gm/imagefiltersbase.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698