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

Side by Side Diff: include/effects/SkDiscretePathEffect.h

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 | « include/effects/SkDashPathEffect.h ('k') | include/effects/SkDisplacementMapEffect.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 * Copyright 2006 The Android Open Source Project 2 * Copyright 2006 The Android Open Source Project
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 #ifndef SkDiscretePathEffect_DEFINED 8 #ifndef SkDiscretePathEffect_DEFINED
9 #define SkDiscretePathEffect_DEFINED 9 #define SkDiscretePathEffect_DEFINED
10 10
(...skipping 19 matching lines...) Expand all
30 different set of path segments. 30 different set of path segments.
31 */ 31 */
32 static SkDiscretePathEffect* Create(SkScalar segLength, 32 static SkDiscretePathEffect* Create(SkScalar segLength,
33 SkScalar deviation, 33 SkScalar deviation,
34 uint32_t seedAssist=0) { 34 uint32_t seedAssist=0) {
35 return SkNEW_ARGS(SkDiscretePathEffect, 35 return SkNEW_ARGS(SkDiscretePathEffect,
36 (segLength, deviation, seedAssist)); 36 (segLength, deviation, seedAssist));
37 } 37 }
38 38
39 virtual bool filterPath(SkPath* dst, const SkPath& src, 39 virtual bool filterPath(SkPath* dst, const SkPath& src,
40 SkStrokeRec*, const SkRect*) const SK_OVERRIDE; 40 SkStrokeRec*, const SkRect*) const override;
41 41
42 SK_TO_STRING_OVERRIDE() 42 SK_TO_STRING_OVERRIDE()
43 SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkDiscretePathEffect) 43 SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkDiscretePathEffect)
44 44
45 #ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK 45 #ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
46 bool exposedInAndroidJavaAPI() const SK_OVERRIDE { return true; } 46 bool exposedInAndroidJavaAPI() const override { return true; }
47 #endif 47 #endif
48 48
49 protected: 49 protected:
50 SkDiscretePathEffect(SkScalar segLength, 50 SkDiscretePathEffect(SkScalar segLength,
51 SkScalar deviation, 51 SkScalar deviation,
52 uint32_t seedAssist); 52 uint32_t seedAssist);
53 void flatten(SkWriteBuffer&) const SK_OVERRIDE; 53 void flatten(SkWriteBuffer&) const override;
54 54
55 private: 55 private:
56 SkScalar fSegLength, fPerterb; 56 SkScalar fSegLength, fPerterb;
57 57
58 /* Caller-supplied 32 bit seed assist */ 58 /* Caller-supplied 32 bit seed assist */
59 uint32_t fSeedAssist; 59 uint32_t fSeedAssist;
60 60
61 typedef SkPathEffect INHERITED; 61 typedef SkPathEffect INHERITED;
62 }; 62 };
63 63
64 #endif 64 #endif
OLDNEW
« no previous file with comments | « include/effects/SkDashPathEffect.h ('k') | include/effects/SkDisplacementMapEffect.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698