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

Side by Side Diff: src/gpu/effects/GrSimpleTextureEffect.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/effects/GrRRectEffect.cpp ('k') | src/gpu/effects/GrSimpleTextureEffect.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 GrSimpleTextureEffect_DEFINED 8 #ifndef GrSimpleTextureEffect_DEFINED
9 #define GrSimpleTextureEffect_DEFINED 9 #define GrSimpleTextureEffect_DEFINED
10 10
(...skipping 29 matching lines...) Expand all
40 40
41 static GrFragmentProcessor* Create(GrTexture* tex, 41 static GrFragmentProcessor* Create(GrTexture* tex,
42 const SkMatrix& matrix, 42 const SkMatrix& matrix,
43 const GrTextureParams& p, 43 const GrTextureParams& p,
44 GrCoordSet coordSet = kLocal_GrCoordSet) { 44 GrCoordSet coordSet = kLocal_GrCoordSet) {
45 return SkNEW_ARGS(GrSimpleTextureEffect, (tex, matrix, p, coordSet)); 45 return SkNEW_ARGS(GrSimpleTextureEffect, (tex, matrix, p, coordSet));
46 } 46 }
47 47
48 virtual ~GrSimpleTextureEffect() {} 48 virtual ~GrSimpleTextureEffect() {}
49 49
50 const char* name() const SK_OVERRIDE { return "SimpleTexture"; } 50 const char* name() const override { return "SimpleTexture"; }
51 51
52 void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVE RRIDE; 52 void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const overri de;
53 53
54 GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; 54 GrGLFragmentProcessor* createGLInstance() const override;
55 55
56 private: 56 private:
57 GrSimpleTextureEffect(GrTexture* texture, 57 GrSimpleTextureEffect(GrTexture* texture,
58 const SkMatrix& matrix, 58 const SkMatrix& matrix,
59 GrTextureParams::FilterMode filterMode, 59 GrTextureParams::FilterMode filterMode,
60 GrCoordSet coordSet) 60 GrCoordSet coordSet)
61 : GrSingleTextureEffect(texture, matrix, filterMode, coordSet) { 61 : GrSingleTextureEffect(texture, matrix, filterMode, coordSet) {
62 this->initClassID<GrSimpleTextureEffect>(); 62 this->initClassID<GrSimpleTextureEffect>();
63 } 63 }
64 64
65 GrSimpleTextureEffect(GrTexture* texture, 65 GrSimpleTextureEffect(GrTexture* texture,
66 const SkMatrix& matrix, 66 const SkMatrix& matrix,
67 const GrTextureParams& params, 67 const GrTextureParams& params,
68 GrCoordSet coordSet) 68 GrCoordSet coordSet)
69 : GrSingleTextureEffect(texture, matrix, params, coordSet) { 69 : GrSingleTextureEffect(texture, matrix, params, coordSet) {
70 this->initClassID<GrSimpleTextureEffect>(); 70 this->initClassID<GrSimpleTextureEffect>();
71 } 71 }
72 72
73 bool onIsEqual(const GrFragmentProcessor& other) const SK_OVERRIDE { return true; } 73 bool onIsEqual(const GrFragmentProcessor& other) const override { return tru e; }
74 74
75 void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE; 75 void onComputeInvariantOutput(GrInvariantOutput* inout) const override;
76 76
77 GR_DECLARE_FRAGMENT_PROCESSOR_TEST; 77 GR_DECLARE_FRAGMENT_PROCESSOR_TEST;
78 78
79 typedef GrSingleTextureEffect INHERITED; 79 typedef GrSingleTextureEffect INHERITED;
80 }; 80 };
81 81
82 #endif 82 #endif
OLDNEW
« no previous file with comments | « src/gpu/effects/GrRRectEffect.cpp ('k') | src/gpu/effects/GrSimpleTextureEffect.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698