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

Side by Side Diff: samplecode/SampleAll.cpp

Issue 806653007: Fix up all the easy virtual ... SK_OVERRIDE cases. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: rebase Created 5 years, 11 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 | « samplecode/OverView.cpp ('k') | samplecode/SampleApp.h » ('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 #include "SampleCode.h" 8 #include "SampleCode.h"
9 #include "SkBlurMask.h" 9 #include "SkBlurMask.h"
10 #include "SkCanvas.h" 10 #include "SkCanvas.h"
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 } 161 }
162 162
163 class Dot2DPathEffect : public Sk2DPathEffect { 163 class Dot2DPathEffect : public Sk2DPathEffect {
164 public: 164 public:
165 Dot2DPathEffect(SkScalar radius, const SkMatrix& matrix) 165 Dot2DPathEffect(SkScalar radius, const SkMatrix& matrix)
166 : Sk2DPathEffect(matrix), fRadius(radius) {} 166 : Sk2DPathEffect(matrix), fRadius(radius) {}
167 167
168 SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(Dot2DPathEffect) 168 SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(Dot2DPathEffect)
169 169
170 protected: 170 protected:
171 virtual void next(const SkPoint& loc, int u, int v, SkPath* dst) const SK_OV ERRIDE { 171 void next(const SkPoint& loc, int u, int v, SkPath* dst) const SK_OVERRIDE {
172 dst->addCircle(loc.fX, loc.fY, fRadius); 172 dst->addCircle(loc.fX, loc.fY, fRadius);
173 } 173 }
174 174
175 virtual void flatten(SkWriteBuffer& buffer) const SK_OVERRIDE { 175 void flatten(SkWriteBuffer& buffer) const SK_OVERRIDE {
176 this->INHERITED::flatten(buffer); 176 this->INHERITED::flatten(buffer);
177 buffer.writeScalar(fRadius); 177 buffer.writeScalar(fRadius);
178 } 178 }
179 179
180 private: 180 private:
181 SkScalar fRadius; 181 SkScalar fRadius;
182 182
183 typedef Sk2DPathEffect INHERITED; 183 typedef Sk2DPathEffect INHERITED;
184 }; 184 };
185 185
(...skipping 404 matching lines...) Expand 10 before | Expand all | Expand 10 after
590 private: 590 private:
591 SkPoint fClickPt; 591 SkPoint fClickPt;
592 SkBitmap fBug, fTb, fTx; 592 SkBitmap fBug, fTb, fTx;
593 typedef SampleView INHERITED; 593 typedef SampleView INHERITED;
594 }; 594 };
595 595
596 ////////////////////////////////////////////////////////////////////////////// 596 //////////////////////////////////////////////////////////////////////////////
597 597
598 static SkView* MyFactory() { return new DemoView; } 598 static SkView* MyFactory() { return new DemoView; }
599 static SkViewRegister reg(MyFactory); 599 static SkViewRegister reg(MyFactory);
OLDNEW
« no previous file with comments | « samplecode/OverView.cpp ('k') | samplecode/SampleApp.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698