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

Side by Side Diff: src/gpu/gl/GrGLPathRendering.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 | « src/gpu/gl/GrGLPathRange.h ('k') | src/gpu/gl/GrGLProgram.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 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 GrGLPathRendering_DEFINED 8 #ifndef GrGLPathRendering_DEFINED
9 #define GrGLPathRendering_DEFINED 9 #define GrGLPathRendering_DEFINED
10 10
(...skipping 15 matching lines...) Expand all
26 */ 26 */
27 class GrGLPathRendering : public GrPathRendering { 27 class GrGLPathRendering : public GrPathRendering {
28 public: 28 public:
29 /** 29 /**
30 * Create a new GrGLPathRendering object from a given GrGLGpu. 30 * Create a new GrGLPathRendering object from a given GrGLGpu.
31 */ 31 */
32 GrGLPathRendering(GrGLGpu* gpu); 32 GrGLPathRendering(GrGLGpu* gpu);
33 virtual ~GrGLPathRendering(); 33 virtual ~GrGLPathRendering();
34 34
35 // GrPathRendering implementations. 35 // GrPathRendering implementations.
36 GrPath* createPath(const SkPath&, const SkStrokeRec&) SK_OVERRIDE; 36 GrPath* createPath(const SkPath&, const SkStrokeRec&) override;
37 virtual GrPathRange* createPathRange(GrPathRange::PathGenerator*, 37 virtual GrPathRange* createPathRange(GrPathRange::PathGenerator*,
38 const SkStrokeRec&) SK_OVERRIDE; 38 const SkStrokeRec&) override;
39 virtual GrPathRange* createGlyphs(const SkTypeface*, 39 virtual GrPathRange* createGlyphs(const SkTypeface*,
40 const SkDescriptor*, 40 const SkDescriptor*,
41 const SkStrokeRec&) SK_OVERRIDE; 41 const SkStrokeRec&) override;
42 void stencilPath(const GrPath*, const GrStencilSettings&) SK_OVERRIDE; 42 void stencilPath(const GrPath*, const GrStencilSettings&) override;
43 void drawPath(const GrPath*, const GrStencilSettings&) SK_OVERRIDE; 43 void drawPath(const GrPath*, const GrStencilSettings&) override;
44 virtual void drawPaths(const GrPathRange*, const void* indices, PathIndexTyp e, 44 virtual void drawPaths(const GrPathRange*, const void* indices, PathIndexTyp e,
45 const float transformValues[], PathTransformType, int count, 45 const float transformValues[], PathTransformType, int count,
46 const GrStencilSettings&) SK_OVERRIDE; 46 const GrStencilSettings&) override;
47 47
48 /* Called when the 3D context state is unknown. */ 48 /* Called when the 3D context state is unknown. */
49 void resetContext(); 49 void resetContext();
50 50
51 /** 51 /**
52 * Called when the GPU resources have been lost and need to be abandoned 52 * Called when the GPU resources have been lost and need to be abandoned
53 * (for example after a context loss). 53 * (for example after a context loss).
54 */ 54 */
55 void abandonGpuResources(); 55 void abandonGpuResources();
56 56
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
166 struct PathTexGenData { 166 struct PathTexGenData {
167 GrGLenum fMode; 167 GrGLenum fMode;
168 GrGLint fNumComponents; 168 GrGLint fNumComponents;
169 GrGLfloat fCoefficients[3 * 3]; 169 GrGLfloat fCoefficients[3 * 3];
170 }; 170 };
171 int fHWActivePathTexGenSets; 171 int fHWActivePathTexGenSets;
172 SkTArray<PathTexGenData, true> fHWPathTexGenSettings; 172 SkTArray<PathTexGenData, true> fHWPathTexGenSettings;
173 }; 173 };
174 174
175 #endif 175 #endif
OLDNEW
« no previous file with comments | « src/gpu/gl/GrGLPathRange.h ('k') | src/gpu/gl/GrGLProgram.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698