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

Side by Side Diff: src/gpu/GrPathProcessor.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/GrOvalRenderer.cpp ('k') | src/gpu/GrPathRendering.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 2013 Google Inc. 2 * Copyright 2013 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 GrPathProcessor_DEFINED 8 #ifndef GrPathProcessor_DEFINED
9 #define GrPathProcessor_DEFINED 9 #define GrPathProcessor_DEFINED
10 10
(...skipping 11 matching lines...) Expand all
22 * extending this class to handle all nvpr uniform / varying / program work. 22 * extending this class to handle all nvpr uniform / varying / program work.
23 */ 23 */
24 class GrPathProcessor : public GrPrimitiveProcessor { 24 class GrPathProcessor : public GrPrimitiveProcessor {
25 public: 25 public:
26 static GrPathProcessor* Create(GrColor color, 26 static GrPathProcessor* Create(GrColor color,
27 const SkMatrix& viewMatrix = SkMatrix::I(), 27 const SkMatrix& viewMatrix = SkMatrix::I(),
28 const SkMatrix& localMatrix = SkMatrix::I()) { 28 const SkMatrix& localMatrix = SkMatrix::I()) {
29 return SkNEW_ARGS(GrPathProcessor, (color, viewMatrix, localMatrix)); 29 return SkNEW_ARGS(GrPathProcessor, (color, viewMatrix, localMatrix));
30 } 30 }
31 31
32 void initBatchTracker(GrBatchTracker*, const GrPipelineInfo&) const SK_OVERR IDE; 32 void initBatchTracker(GrBatchTracker*, const GrPipelineInfo&) const override ;
33 33
34 bool canMakeEqual(const GrBatchTracker& mine, 34 bool canMakeEqual(const GrBatchTracker& mine,
35 const GrPrimitiveProcessor& that, 35 const GrPrimitiveProcessor& that,
36 const GrBatchTracker& theirs) const SK_OVERRIDE; 36 const GrBatchTracker& theirs) const override;
37 37
38 const char* name() const SK_OVERRIDE { return "PathProcessor"; } 38 const char* name() const override { return "PathProcessor"; }
39 39
40 GrColor color() const { return fColor; } 40 GrColor color() const { return fColor; }
41 41
42 void getInvariantOutputColor(GrInitInvariantOutput* out) const SK_OVERRIDE; 42 void getInvariantOutputColor(GrInitInvariantOutput* out) const override;
43 void getInvariantOutputCoverage(GrInitInvariantOutput* out) const SK_OVERRID E; 43 void getInvariantOutputCoverage(GrInitInvariantOutput* out) const override;
44 44
45 bool willUseGeoShader() const SK_OVERRIDE { return false; } 45 bool willUseGeoShader() const override { return false; }
46 46
47 virtual void getGLProcessorKey(const GrBatchTracker& bt, 47 virtual void getGLProcessorKey(const GrBatchTracker& bt,
48 const GrGLCaps& caps, 48 const GrGLCaps& caps,
49 GrProcessorKeyBuilder* b) const SK_OVERRIDE; 49 GrProcessorKeyBuilder* b) const override;
50 50
51 virtual GrGLPrimitiveProcessor* createGLInstance(const GrBatchTracker& bt, 51 virtual GrGLPrimitiveProcessor* createGLInstance(const GrBatchTracker& bt,
52 const GrGLCaps& caps) const SK_OVERRIDE; 52 const GrGLCaps& caps) const override;
53 53
54 protected: 54 protected:
55 GrPathProcessor(GrColor color, const SkMatrix& viewMatrix, const SkMatrix& l ocalMatrix); 55 GrPathProcessor(GrColor color, const SkMatrix& viewMatrix, const SkMatrix& l ocalMatrix);
56 56
57 private: 57 private:
58 bool hasExplicitLocalCoords() const SK_OVERRIDE { return false; } 58 bool hasExplicitLocalCoords() const override { return false; }
59 59
60 GrColor fColor; 60 GrColor fColor;
61 61
62 typedef GrPrimitiveProcessor INHERITED; 62 typedef GrPrimitiveProcessor INHERITED;
63 }; 63 };
64 64
65 #endif 65 #endif
OLDNEW
« no previous file with comments | « src/gpu/GrOvalRenderer.cpp ('k') | src/gpu/GrPathRendering.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698