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/effects/gradients/SkTwoPointConicalGradient_gpu.cpp b/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp
index c9f2d2f..a31bfd4 100644
--- a/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp
+++ b/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp
@@ -66,13 +66,13 @@
virtual ~Edge2PtConicalEffect() {}
- const char* name() const SK_OVERRIDE {
+ const char* name() const override {
return "Two-Point Conical Gradient Edge Touching";
}
- void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE;
+ void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const override;
- GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE;
+ GrGLFragmentProcessor* createGLInstance() const override;
// The radial gradient parameters can collapse to a linear (instead of quadratic) equation.
SkScalar center() const { return fCenterX1; }
@@ -80,7 +80,7 @@
SkScalar radius() const { return fRadius0; }
private:
- bool onIsEqual(const GrFragmentProcessor& sBase) const SK_OVERRIDE {
+ bool onIsEqual(const GrFragmentProcessor& sBase) const override {
const Edge2PtConicalEffect& s = sBase.cast<Edge2PtConicalEffect>();
return (INHERITED::onIsEqual(sBase) &&
this->fCenterX1 == s.fCenterX1 &&
@@ -146,8 +146,8 @@
const char* outputColor,
const char* inputColor,
const TransformedCoordsArray&,
- const TextureSamplerArray&) SK_OVERRIDE;
- void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE;
+ const TextureSamplerArray&) override;
+ void setData(const GrGLProgramDataManager&, const GrProcessor&) override;
static void GenKey(const GrProcessor&, const GrGLCaps& caps, GrProcessorKeyBuilder* b);
@@ -388,19 +388,19 @@
virtual ~FocalOutside2PtConicalEffect() { }
- const char* name() const SK_OVERRIDE {
+ const char* name() const override {
return "Two-Point Conical Gradient Focal Outside";
}
- void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE;
+ void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const override;
- GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE;
+ GrGLFragmentProcessor* createGLInstance() const override;
bool isFlipped() const { return fIsFlipped; }
SkScalar focal() const { return fFocalX; }
private:
- bool onIsEqual(const GrFragmentProcessor& sBase) const SK_OVERRIDE {
+ bool onIsEqual(const GrFragmentProcessor& sBase) const override {
const FocalOutside2PtConicalEffect& s = sBase.cast<FocalOutside2PtConicalEffect>();
return (INHERITED::onIsEqual(sBase) &&
this->fFocalX == s.fFocalX &&
@@ -434,8 +434,8 @@
const char* outputColor,
const char* inputColor,
const TransformedCoordsArray&,
- const TextureSamplerArray&) SK_OVERRIDE;
- void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE;
+ const TextureSamplerArray&) override;
+ void setData(const GrGLProgramDataManager&, const GrProcessor&) override;
static void GenKey(const GrProcessor&, const GrGLCaps& caps, GrProcessorKeyBuilder* b);
@@ -610,20 +610,20 @@
virtual ~FocalInside2PtConicalEffect() {}
- const char* name() const SK_OVERRIDE {
+ const char* name() const override {
return "Two-Point Conical Gradient Focal Inside";
}
- void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE;
+ void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const override;
- GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE;
+ GrGLFragmentProcessor* createGLInstance() const override;
SkScalar focal() const { return fFocalX; }
typedef GLFocalInside2PtConicalEffect GLProcessor;
private:
- bool onIsEqual(const GrFragmentProcessor& sBase) const SK_OVERRIDE {
+ bool onIsEqual(const GrFragmentProcessor& sBase) const override {
const FocalInside2PtConicalEffect& s = sBase.cast<FocalInside2PtConicalEffect>();
return (INHERITED::onIsEqual(sBase) &&
this->fFocalX == s.fFocalX);
@@ -655,8 +655,8 @@
const char* outputColor,
const char* inputColor,
const TransformedCoordsArray&,
- const TextureSamplerArray&) SK_OVERRIDE;
- void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE;
+ const TextureSamplerArray&) override;
+ void setData(const GrGLProgramDataManager&, const GrProcessor&) override;
static void GenKey(const GrProcessor&, const GrGLCaps& caps, GrProcessorKeyBuilder* b);
@@ -857,12 +857,12 @@
virtual ~CircleInside2PtConicalEffect() {}
- const char* name() const SK_OVERRIDE { return "Two-Point Conical Gradient Inside"; }
+ const char* name() const override { return "Two-Point Conical Gradient Inside"; }
virtual void getGLProcessorKey(const GrGLCaps& caps,
- GrProcessorKeyBuilder* b) const SK_OVERRIDE;
+ GrProcessorKeyBuilder* b) const override;
- GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE;
+ GrGLFragmentProcessor* createGLInstance() const override;
SkScalar centerX() const { return fInfo.fCenterEnd.fX; }
SkScalar centerY() const { return fInfo.fCenterEnd.fY; }
@@ -871,7 +871,7 @@
SkScalar C() const { return fInfo.fC; }
private:
- bool onIsEqual(const GrFragmentProcessor& sBase) const SK_OVERRIDE {
+ bool onIsEqual(const GrFragmentProcessor& sBase) const override {
const CircleInside2PtConicalEffect& s = sBase.cast<CircleInside2PtConicalEffect>();
return (INHERITED::onIsEqual(sBase) &&
this->fInfo.fCenterEnd == s.fInfo.fCenterEnd &&
@@ -906,8 +906,8 @@
const char* outputColor,
const char* inputColor,
const TransformedCoordsArray&,
- const TextureSamplerArray&) SK_OVERRIDE;
- void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE;
+ const TextureSamplerArray&) override;
+ void setData(const GrGLProgramDataManager&, const GrProcessor&) override;
static void GenKey(const GrProcessor&, const GrGLCaps& caps, GrProcessorKeyBuilder* b);
@@ -1081,11 +1081,11 @@
virtual ~CircleOutside2PtConicalEffect() {}
- const char* name() const SK_OVERRIDE { return "Two-Point Conical Gradient Outside"; }
+ const char* name() const override { return "Two-Point Conical Gradient Outside"; }
- void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE;
+ void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const override;
- GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE;
+ GrGLFragmentProcessor* createGLInstance() const override;
SkScalar centerX() const { return fInfo.fCenterEnd.fX; }
SkScalar centerY() const { return fInfo.fCenterEnd.fY; }
@@ -1096,7 +1096,7 @@
bool isFlipped() const { return fIsFlipped; }
private:
- bool onIsEqual(const GrFragmentProcessor& sBase) const SK_OVERRIDE {
+ bool onIsEqual(const GrFragmentProcessor& sBase) const override {
const CircleOutside2PtConicalEffect& s = sBase.cast<CircleOutside2PtConicalEffect>();
return (INHERITED::onIsEqual(sBase) &&
this->fInfo.fCenterEnd == s.fInfo.fCenterEnd &&
@@ -1143,8 +1143,8 @@
const char* outputColor,
const char* inputColor,
const TransformedCoordsArray&,
- const TextureSamplerArray&) SK_OVERRIDE;
- void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE;
+ const TextureSamplerArray&) override;
+ void setData(const GrGLProgramDataManager&, const GrProcessor&) override;
static void GenKey(const GrProcessor&, const GrGLCaps& caps, GrProcessorKeyBuilder* b);