C++11 override should now be supported by all of {bots,Chrome,Android,Mozilla}
NOPRESUBMIT=true
BUG=skia:
DOCS_PREVIEW= https://skia.org/?cl=1037793002
Review URL: https://codereview.chromium.org/1037793002
diff --git a/src/gpu/effects/GrConvolutionEffect.h b/src/gpu/effects/GrConvolutionEffect.h
index 4ea436c..fa6329a 100644
--- a/src/gpu/effects/GrConvolutionEffect.h
+++ b/src/gpu/effects/GrConvolutionEffect.h
@@ -57,11 +57,11 @@
const float* bounds() const { return fBounds; }
bool useBounds() const { return fUseBounds; }
- const char* name() const SK_OVERRIDE { return "Convolution"; }
+ const char* name() const override { return "Convolution"; }
- void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE;
+ void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const override;
- GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE;
+ GrGLFragmentProcessor* createGLInstance() const override;
enum {
// This was decided based on the min allowed value for the max texture
@@ -94,9 +94,9 @@
bool useBounds,
float bounds[2]);
- bool onIsEqual(const GrFragmentProcessor&) const SK_OVERRIDE;
+ bool onIsEqual(const GrFragmentProcessor&) const override;
- void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE {
+ void onComputeInvariantOutput(GrInvariantOutput* inout) const override {
// If the texture was opaque we could know that the output color if we knew the sum of the
// kernel values.
inout->mulByUnknownFourComponents();