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

Side by Side Diff: gm/shadertext2.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/shadertext.cpp ('k') | gm/shadertext3.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 #include "gm.h" 7 #include "gm.h"
8 #include "SkCanvas.h" 8 #include "SkCanvas.h"
9 #include "SkGradientShader.h" 9 #include "SkGradientShader.h"
10 10
(...skipping 30 matching lines...) Expand all
41 }; 41 };
42 42
43 class ShaderText2GM : public GM { 43 class ShaderText2GM : public GM {
44 public: 44 public:
45 ShaderText2GM() { 45 ShaderText2GM() {
46 this->setBGColor(0xFFDDDDDD); 46 this->setBGColor(0xFFDDDDDD);
47 } 47 }
48 48
49 protected: 49 protected:
50 50
51 SkString onShortName() SK_OVERRIDE { 51 SkString onShortName() override {
52 return SkString("shadertext2"); 52 return SkString("shadertext2");
53 } 53 }
54 54
55 SkISize onISize() SK_OVERRIDE { return SkISize::Make(1800, 900); } 55 SkISize onISize() override { return SkISize::Make(1800, 900); }
56 56
57 void onDraw(SkCanvas* canvas) SK_OVERRIDE { 57 void onDraw(SkCanvas* canvas) override {
58 static const char kText[] = "SKIA"; 58 static const char kText[] = "SKIA";
59 static const int kTextLen = SK_ARRAY_COUNT(kText) - 1; 59 static const int kTextLen = SK_ARRAY_COUNT(kText) - 1;
60 static const int kPointSize = 55; 60 static const int kPointSize = 55;
61 61
62 SkTDArray<LabeledMatrix> matrices; 62 SkTDArray<LabeledMatrix> matrices;
63 matrices.append()->fMatrix.reset(); 63 matrices.append()->fMatrix.reset();
64 matrices.top().fLabel = "Identity"; 64 matrices.top().fLabel = "Identity";
65 matrices.append()->fMatrix.setScale(1.2f, 0.8f); 65 matrices.append()->fMatrix.setScale(1.2f, 0.8f);
66 matrices.top().fLabel = "Scale"; 66 matrices.top().fLabel = "Scale";
67 matrices.append()->fMatrix.setRotate(10.f); 67 matrices.append()->fMatrix.setRotate(10.f);
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
201 201
202 private: 202 private:
203 typedef GM INHERITED; 203 typedef GM INHERITED;
204 }; 204 };
205 205
206 /////////////////////////////////////////////////////////////////////////////// 206 ///////////////////////////////////////////////////////////////////////////////
207 207
208 static GM* MyFactory(void*) { return new ShaderText2GM; } 208 static GM* MyFactory(void*) { return new ShaderText2GM; }
209 static GMRegistry reg(MyFactory); 209 static GMRegistry reg(MyFactory);
210 } 210 }
OLDNEW
« no previous file with comments | « gm/shadertext.cpp ('k') | gm/shadertext3.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698