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

Side by Side Diff: gm/testimagefilters.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/tallstretchedbitmaps.cpp ('k') | gm/texdata.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 "SkCanvas.h" 9 #include "SkCanvas.h"
10 #include "SkColorFilter.h" 10 #include "SkColorFilter.h"
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 p.setColor(SK_ColorRED); 90 p.setColor(SK_ColorRED);
91 canvas->drawOval(r, p); 91 canvas->drawOval(r, p);
92 } 92 }
93 93
94 class TestImageFiltersGM : public skiagm::GM { 94 class TestImageFiltersGM : public skiagm::GM {
95 public: 95 public:
96 TestImageFiltersGM () {} 96 TestImageFiltersGM () {}
97 97
98 protected: 98 protected:
99 99
100 SkString onShortName() SK_OVERRIDE { 100 SkString onShortName() override {
101 return SkString("testimagefilters"); 101 return SkString("testimagefilters");
102 } 102 }
103 103
104 SkISize onISize() SK_OVERRIDE { return SkISize::Make(700, 460); } 104 SkISize onISize() override { return SkISize::Make(700, 460); }
105 105
106 void onDraw(SkCanvas* canvas) SK_OVERRIDE { 106 void onDraw(SkCanvas* canvas) override {
107 // this->drawSizeBounds(canvas, 0xFFCCCCCC); 107 // this->drawSizeBounds(canvas, 0xFFCCCCCC);
108 108
109 static SkImageFilter* (*gFilterProc[])() = { 109 static SkImageFilter* (*gFilterProc[])() = {
110 make0, make1, make2, make3, make4, make5, make6, make7 110 make0, make1, make2, make3, make4, make5, make6, make7
111 }; 111 };
112 112
113 const SkRect bounds = SkRect::MakeWH(FILTER_WIDTH, FILTER_HEIGHT); 113 const SkRect bounds = SkRect::MakeWH(FILTER_WIDTH, FILTER_HEIGHT);
114 114
115 const SkScalar dx = bounds.width() * 8 / 7; 115 const SkScalar dx = bounds.width() * 8 / 7;
116 const SkScalar dy = bounds.height() * 8 / 7; 116 const SkScalar dy = bounds.height() * 8 / 7;
(...skipping 19 matching lines...) Expand all
136 } 136 }
137 137
138 private: 138 private:
139 typedef GM INHERITED; 139 typedef GM INHERITED;
140 }; 140 };
141 141
142 ////////////////////////////////////////////////////////////////////////////// 142 //////////////////////////////////////////////////////////////////////////////
143 143
144 static skiagm::GM* MyFactory(void*) { return new TestImageFiltersGM; } 144 static skiagm::GM* MyFactory(void*) { return new TestImageFiltersGM; }
145 static skiagm::GMRegistry reg(MyFactory); 145 static skiagm::GMRegistry reg(MyFactory);
OLDNEW
« no previous file with comments | « gm/tallstretchedbitmaps.cpp ('k') | gm/texdata.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698