Index: src/effects/SkColorCubeFilter.cpp |
diff --git a/src/effects/SkColorCubeFilter.cpp b/src/effects/SkColorCubeFilter.cpp |
index e2aade75e551bed39458775883d61cab26dfcb55..989c4a6754854a1b88a7623dc17d760289f627b1 100644 |
--- a/src/effects/SkColorCubeFilter.cpp |
+++ b/src/effects/SkColorCubeFilter.cpp |
@@ -192,16 +192,16 @@ public: |
virtual ~GrColorCubeEffect(); |
- const char* name() const SK_OVERRIDE { return "ColorCube"; } |
+ const char* name() const override { return "ColorCube"; } |
virtual void getGLProcessorKey(const GrGLCaps& caps, |
- GrProcessorKeyBuilder* b) const SK_OVERRIDE; |
+ GrProcessorKeyBuilder* b) const override; |
- GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; |
+ GrGLFragmentProcessor* createGLInstance() const override; |
int colorCubeSize() const { return fColorCubeAccess.getTexture()->width(); } |
- void onComputeInvariantOutput(GrInvariantOutput*) const SK_OVERRIDE; |
+ void onComputeInvariantOutput(GrInvariantOutput*) const override; |
class GLProcessor : public GrGLFragmentProcessor { |
public: |
@@ -213,11 +213,11 @@ public: |
const char* outputColor, |
const char* inputColor, |
const TransformedCoordsArray&, |
- const TextureSamplerArray&) SK_OVERRIDE; |
+ const TextureSamplerArray&) override; |
static inline void GenKey(const GrProcessor&, const GrGLCaps&, GrProcessorKeyBuilder*); |
- void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE; |
+ void setData(const GrGLProgramDataManager&, const GrProcessor&) override; |
private: |
GrGLProgramDataManager::UniformHandle fColorCubeSizeUni; |
@@ -227,7 +227,7 @@ public: |
}; |
private: |
- bool onIsEqual(const GrFragmentProcessor&) const SK_OVERRIDE { return true; } |
+ bool onIsEqual(const GrFragmentProcessor&) const override { return true; } |
GrColorCubeEffect(GrTexture* colorCube); |