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

Side by Side Diff: src/gpu/effects/GrConvexPolyEffect.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, 8 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 | « src/gpu/effects/GrConfigConversionEffect.cpp ('k') | src/gpu/effects/GrConvexPolyEffect.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 2014 Google Inc. 2 * Copyright 2014 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 #ifndef GrConvexPolyEffect_DEFINED 8 #ifndef GrConvexPolyEffect_DEFINED
9 #define GrConvexPolyEffect_DEFINED 9 #define GrConvexPolyEffect_DEFINED
10 10
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 static GrFragmentProcessor* Create(GrPrimitiveEdgeType, const SkPath&, 54 static GrFragmentProcessor* Create(GrPrimitiveEdgeType, const SkPath&,
55 const SkVector* offset = NULL); 55 const SkVector* offset = NULL);
56 56
57 /** 57 /**
58 * Creates an effect that fills inside the rect with AA edges.. 58 * Creates an effect that fills inside the rect with AA edges..
59 */ 59 */
60 static GrFragmentProcessor* Create(GrPrimitiveEdgeType, const SkRect&); 60 static GrFragmentProcessor* Create(GrPrimitiveEdgeType, const SkRect&);
61 61
62 virtual ~GrConvexPolyEffect(); 62 virtual ~GrConvexPolyEffect();
63 63
64 const char* name() const SK_OVERRIDE { return "ConvexPoly"; } 64 const char* name() const override { return "ConvexPoly"; }
65 65
66 GrPrimitiveEdgeType getEdgeType() const { return fEdgeType; } 66 GrPrimitiveEdgeType getEdgeType() const { return fEdgeType; }
67 67
68 int getEdgeCount() const { return fEdgeCount; } 68 int getEdgeCount() const { return fEdgeCount; }
69 69
70 const SkScalar* getEdges() const { return fEdges; } 70 const SkScalar* getEdges() const { return fEdges; }
71 71
72 void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVE RRIDE; 72 void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const overri de;
73 73
74 GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; 74 GrGLFragmentProcessor* createGLInstance() const override;
75 75
76 private: 76 private:
77 GrConvexPolyEffect(GrPrimitiveEdgeType edgeType, int n, const SkScalar edges []); 77 GrConvexPolyEffect(GrPrimitiveEdgeType edgeType, int n, const SkScalar edges []);
78 78
79 bool onIsEqual(const GrFragmentProcessor& other) const SK_OVERRIDE; 79 bool onIsEqual(const GrFragmentProcessor& other) const override;
80 80
81 void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE; 81 void onComputeInvariantOutput(GrInvariantOutput* inout) const override;
82 82
83 GrPrimitiveEdgeType fEdgeType; 83 GrPrimitiveEdgeType fEdgeType;
84 int fEdgeCount; 84 int fEdgeCount;
85 SkScalar fEdges[3 * kMaxEdges]; 85 SkScalar fEdges[3 * kMaxEdges];
86 86
87 GR_DECLARE_FRAGMENT_PROCESSOR_TEST; 87 GR_DECLARE_FRAGMENT_PROCESSOR_TEST;
88 88
89 typedef GrFragmentProcessor INHERITED; 89 typedef GrFragmentProcessor INHERITED;
90 }; 90 };
91 91
92 92
93 #endif 93 #endif
OLDNEW
« no previous file with comments | « src/gpu/effects/GrConfigConversionEffect.cpp ('k') | src/gpu/effects/GrConvexPolyEffect.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698