Fix up all the easy virtual ... SK_OVERRIDE cases.
This fixes every case where virtual and SK_OVERRIDE were on the same line,
which should be the bulk of cases. We'll have to manually clean up the rest
over time unless I level up in regexes.
for f in (find . -type f); perl -p -i -e 's/virtual (.*)SK_OVERRIDE/\1SK_OVERRIDE/g' $f; end
BUG=skia:
Review URL: https://codereview.chromium.org/806653007
diff --git a/src/effects/gradients/SkGradientShaderPriv.h b/src/effects/gradients/SkGradientShaderPriv.h
index 125c7b0..99ad70c 100644
--- a/src/effects/gradients/SkGradientShaderPriv.h
+++ b/src/effects/gradients/SkGradientShaderPriv.h
@@ -166,7 +166,7 @@
public:
GradientShaderBaseContext(const SkGradientShaderBase& shader, const ContextRec&);
- virtual uint32_t getFlags() const SK_OVERRIDE { return fFlags; }
+ uint32_t getFlags() const SK_OVERRIDE { return fFlags; }
protected:
SkMatrix fDstToIndex;
@@ -180,7 +180,7 @@
typedef SkShader::Context INHERITED;
};
- virtual bool isOpaque() const SK_OVERRIDE;
+ bool isOpaque() const SK_OVERRIDE;
void getGradientTableBitmap(SkBitmap*) const;
@@ -220,7 +220,7 @@
protected:
SkGradientShaderBase(SkReadBuffer& );
- virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
+ void flatten(SkWriteBuffer&) const SK_OVERRIDE;
SK_TO_STRING_OVERRIDE()
const SkMatrix fPtsToUnit;
@@ -237,7 +237,7 @@
void commonAsAGradient(GradientInfo*, bool flipGrad = false) const;
- virtual bool onAsLuminanceColor(SkColor*) const SK_OVERRIDE;
+ bool onAsLuminanceColor(SkColor*) const SK_OVERRIDE;
/*
* Takes in pointers to gradient color and Rec info as colorSrc and recSrc respectively.
@@ -368,9 +368,9 @@
SkScalar** stops,
SkShader::TileMode* tm);
- virtual bool onIsEqual(const GrFragmentProcessor&) const SK_OVERRIDE;
+ bool onIsEqual(const GrFragmentProcessor&) const SK_OVERRIDE;
- virtual void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE;
+ void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE;
const GrCoordTransform& getCoordTransform() const { return fCoordTransform; }
@@ -399,7 +399,7 @@
GrGLGradientEffect();
virtual ~GrGLGradientEffect();
- virtual void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE;
+ void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE;
protected:
/**
diff --git a/src/effects/gradients/SkLinearGradient.cpp b/src/effects/gradients/SkLinearGradient.cpp
index 885a1b5..b34c796 100644
--- a/src/effects/gradients/SkLinearGradient.cpp
+++ b/src/effects/gradients/SkLinearGradient.cpp
@@ -495,14 +495,14 @@
virtual ~GrLinearGradient() { }
- virtual const char* name() const SK_OVERRIDE { return "Linear Gradient"; }
+ const char* name() const SK_OVERRIDE { return "Linear Gradient"; }
virtual void getGLProcessorKey(const GrGLCaps& caps,
GrProcessorKeyBuilder* b) const SK_OVERRIDE {
GrGLLinearGradient::GenKey(*this, caps, b);
}
- virtual GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE {
+ GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE {
return SkNEW_ARGS(GrGLLinearGradient, (*this));
}
diff --git a/src/effects/gradients/SkLinearGradient.h b/src/effects/gradients/SkLinearGradient.h
index 1a7688d..e63a1b8 100644
--- a/src/effects/gradients/SkLinearGradient.h
+++ b/src/effects/gradients/SkLinearGradient.h
@@ -14,22 +14,22 @@
public:
SkLinearGradient(const SkPoint pts[2], const Descriptor&);
- virtual size_t contextSize() const SK_OVERRIDE;
+ size_t contextSize() const SK_OVERRIDE;
class LinearGradientContext : public SkGradientShaderBase::GradientShaderBaseContext {
public:
LinearGradientContext(const SkLinearGradient&, const ContextRec&);
~LinearGradientContext() {}
- virtual void shadeSpan(int x, int y, SkPMColor dstC[], int count) SK_OVERRIDE;
- virtual void shadeSpan16(int x, int y, uint16_t dstC[], int count) SK_OVERRIDE;
+ void shadeSpan(int x, int y, SkPMColor dstC[], int count) SK_OVERRIDE;
+ void shadeSpan16(int x, int y, uint16_t dstC[], int count) SK_OVERRIDE;
private:
typedef SkGradientShaderBase::GradientShaderBaseContext INHERITED;
};
- virtual BitmapType asABitmap(SkBitmap*, SkMatrix*, TileMode*) const SK_OVERRIDE;
- virtual GradientType asAGradient(GradientInfo* info) const SK_OVERRIDE;
+ BitmapType asABitmap(SkBitmap*, SkMatrix*, TileMode*) const SK_OVERRIDE;
+ GradientType asAGradient(GradientInfo* info) const SK_OVERRIDE;
virtual bool asFragmentProcessor(GrContext*, const SkPaint&, const SkMatrix& viewM,
const SkMatrix*,
GrColor*, GrFragmentProcessor**) const SK_OVERRIDE;
@@ -39,8 +39,8 @@
protected:
SkLinearGradient(SkReadBuffer& buffer);
- virtual void flatten(SkWriteBuffer& buffer) const SK_OVERRIDE;
- virtual Context* onCreateContext(const ContextRec&, void* storage) const SK_OVERRIDE;
+ void flatten(SkWriteBuffer& buffer) const SK_OVERRIDE;
+ Context* onCreateContext(const ContextRec&, void* storage) const SK_OVERRIDE;
private:
friend class SkGradientShader;
diff --git a/src/effects/gradients/SkRadialGradient.cpp b/src/effects/gradients/SkRadialGradient.cpp
index 4f451b7..5ea2e72 100644
--- a/src/effects/gradients/SkRadialGradient.cpp
+++ b/src/effects/gradients/SkRadialGradient.cpp
@@ -498,14 +498,14 @@
virtual ~GrRadialGradient() { }
- virtual const char* name() const SK_OVERRIDE { return "Radial Gradient"; }
+ const char* name() const SK_OVERRIDE { return "Radial Gradient"; }
virtual void getGLProcessorKey(const GrGLCaps& caps,
GrProcessorKeyBuilder* b) const SK_OVERRIDE {
GrGLRadialGradient::GenKey(*this, caps, b);
}
- virtual GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE {
+ GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE {
return SkNEW_ARGS(GrGLRadialGradient, (*this));
}
diff --git a/src/effects/gradients/SkRadialGradient.h b/src/effects/gradients/SkRadialGradient.h
index 56d4d7e..a690bb5 100644
--- a/src/effects/gradients/SkRadialGradient.h
+++ b/src/effects/gradients/SkRadialGradient.h
@@ -15,14 +15,14 @@
public:
SkRadialGradient(const SkPoint& center, SkScalar radius, const Descriptor&);
- virtual size_t contextSize() const SK_OVERRIDE;
+ size_t contextSize() const SK_OVERRIDE;
class RadialGradientContext : public SkGradientShaderBase::GradientShaderBaseContext {
public:
RadialGradientContext(const SkRadialGradient&, const ContextRec&);
- virtual void shadeSpan(int x, int y, SkPMColor dstC[], int count) SK_OVERRIDE;
- virtual void shadeSpan16(int x, int y, uint16_t dstC[], int count) SK_OVERRIDE;
+ void shadeSpan(int x, int y, SkPMColor dstC[], int count) SK_OVERRIDE;
+ void shadeSpan16(int x, int y, uint16_t dstC[], int count) SK_OVERRIDE;
private:
typedef SkGradientShaderBase::GradientShaderBaseContext INHERITED;
@@ -31,7 +31,7 @@
virtual BitmapType asABitmap(SkBitmap* bitmap,
SkMatrix* matrix,
TileMode* xy) const SK_OVERRIDE;
- virtual GradientType asAGradient(GradientInfo* info) const SK_OVERRIDE;
+ GradientType asAGradient(GradientInfo* info) const SK_OVERRIDE;
virtual bool asFragmentProcessor(GrContext*, const SkPaint&, const SkMatrix& viewM,
const SkMatrix*, GrColor*,
GrFragmentProcessor**) const SK_OVERRIDE;
@@ -41,8 +41,8 @@
protected:
SkRadialGradient(SkReadBuffer& buffer);
- virtual void flatten(SkWriteBuffer& buffer) const SK_OVERRIDE;
- virtual Context* onCreateContext(const ContextRec&, void* storage) const SK_OVERRIDE;
+ void flatten(SkWriteBuffer& buffer) const SK_OVERRIDE;
+ Context* onCreateContext(const ContextRec&, void* storage) const SK_OVERRIDE;
private:
friend class SkGradientShader;
diff --git a/src/effects/gradients/SkSweepGradient.cpp b/src/effects/gradients/SkSweepGradient.cpp
index bcb2b0d..f8ee458 100644
--- a/src/effects/gradients/SkSweepGradient.cpp
+++ b/src/effects/gradients/SkSweepGradient.cpp
@@ -217,14 +217,14 @@
}
virtual ~GrSweepGradient() { }
- virtual const char* name() const SK_OVERRIDE { return "Sweep Gradient"; }
+ const char* name() const SK_OVERRIDE { return "Sweep Gradient"; }
virtual void getGLProcessorKey(const GrGLCaps& caps,
GrProcessorKeyBuilder* b) const SK_OVERRIDE {
GrGLSweepGradient::GenKey(*this, caps, b);
}
- virtual GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE {
+ GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE {
return SkNEW_ARGS(GrGLSweepGradient, (*this));
}
diff --git a/src/effects/gradients/SkSweepGradient.h b/src/effects/gradients/SkSweepGradient.h
index 9408fea..b72a08d 100644
--- a/src/effects/gradients/SkSweepGradient.h
+++ b/src/effects/gradients/SkSweepGradient.h
@@ -15,14 +15,14 @@
public:
SkSweepGradient(SkScalar cx, SkScalar cy, const Descriptor&);
- virtual size_t contextSize() const SK_OVERRIDE;
+ size_t contextSize() const SK_OVERRIDE;
class SweepGradientContext : public SkGradientShaderBase::GradientShaderBaseContext {
public:
SweepGradientContext(const SkSweepGradient& shader, const ContextRec&);
- virtual void shadeSpan(int x, int y, SkPMColor dstC[], int count) SK_OVERRIDE;
- virtual void shadeSpan16(int x, int y, uint16_t dstC[], int count) SK_OVERRIDE;
+ void shadeSpan(int x, int y, SkPMColor dstC[], int count) SK_OVERRIDE;
+ void shadeSpan16(int x, int y, uint16_t dstC[], int count) SK_OVERRIDE;
private:
typedef SkGradientShaderBase::GradientShaderBaseContext INHERITED;
@@ -32,7 +32,7 @@
SkMatrix* matrix,
TileMode* xy) const SK_OVERRIDE;
- virtual GradientType asAGradient(GradientInfo* info) const SK_OVERRIDE;
+ GradientType asAGradient(GradientInfo* info) const SK_OVERRIDE;
virtual bool asFragmentProcessor(GrContext*, const SkPaint&, const SkMatrix& viewM,
const SkMatrix*, GrColor*,
@@ -42,8 +42,8 @@
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkSweepGradient)
protected:
- virtual void flatten(SkWriteBuffer& buffer) const SK_OVERRIDE;
- virtual Context* onCreateContext(const ContextRec&, void* storage) const SK_OVERRIDE;
+ void flatten(SkWriteBuffer& buffer) const SK_OVERRIDE;
+ Context* onCreateContext(const ContextRec&, void* storage) const SK_OVERRIDE;
private:
const SkPoint fCenter;
diff --git a/src/effects/gradients/SkTwoPointConicalGradient.h b/src/effects/gradients/SkTwoPointConicalGradient.h
index 217400e..ff12236 100644
--- a/src/effects/gradients/SkTwoPointConicalGradient.h
+++ b/src/effects/gradients/SkTwoPointConicalGradient.h
@@ -45,14 +45,14 @@
bool flippedGrad, const Descriptor&);
- virtual size_t contextSize() const SK_OVERRIDE;
+ size_t contextSize() const SK_OVERRIDE;
class TwoPointConicalGradientContext : public SkGradientShaderBase::GradientShaderBaseContext {
public:
TwoPointConicalGradientContext(const SkTwoPointConicalGradient&, const ContextRec&);
~TwoPointConicalGradientContext() {}
- virtual void shadeSpan(int x, int y, SkPMColor dstC[], int count) SK_OVERRIDE;
+ void shadeSpan(int x, int y, SkPMColor dstC[], int count) SK_OVERRIDE;
private:
typedef SkGradientShaderBase::GradientShaderBaseContext INHERITED;
@@ -61,10 +61,10 @@
virtual BitmapType asABitmap(SkBitmap* bitmap,
SkMatrix* matrix,
TileMode* xy) const SK_OVERRIDE;
- virtual SkShader::GradientType asAGradient(GradientInfo* info) const SK_OVERRIDE;
+ SkShader::GradientType asAGradient(GradientInfo* info) const SK_OVERRIDE;
virtual bool asFragmentProcessor(GrContext*, const SkPaint&, const SkMatrix&, const SkMatrix*,
GrColor*, GrFragmentProcessor**) const SK_OVERRIDE;
- virtual bool isOpaque() const SK_OVERRIDE;
+ bool isOpaque() const SK_OVERRIDE;
SkScalar getCenterX1() const { return SkPoint::Distance(fCenter1, fCenter2); }
SkScalar getStartRadius() const { return fRadius1; }
@@ -79,8 +79,8 @@
protected:
SkTwoPointConicalGradient(SkReadBuffer& buffer);
- virtual void flatten(SkWriteBuffer& buffer) const SK_OVERRIDE;
- virtual Context* onCreateContext(const ContextRec&, void* storage) const SK_OVERRIDE;
+ void flatten(SkWriteBuffer& buffer) const SK_OVERRIDE;
+ Context* onCreateContext(const ContextRec&, void* storage) const SK_OVERRIDE;
private:
SkPoint fCenter1;
diff --git a/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp b/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp
index 8783de7..c9f2d2f 100644
--- a/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp
+++ b/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp
@@ -66,13 +66,13 @@
virtual ~Edge2PtConicalEffect() {}
- virtual const char* name() const SK_OVERRIDE {
+ const char* name() const SK_OVERRIDE {
return "Two-Point Conical Gradient Edge Touching";
}
- virtual void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE;
+ void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE;
- virtual GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE;
+ GrGLFragmentProcessor* createGLInstance() const SK_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:
- virtual bool onIsEqual(const GrFragmentProcessor& sBase) const SK_OVERRIDE {
+ bool onIsEqual(const GrFragmentProcessor& sBase) const SK_OVERRIDE {
const Edge2PtConicalEffect& s = sBase.cast<Edge2PtConicalEffect>();
return (INHERITED::onIsEqual(sBase) &&
this->fCenterX1 == s.fCenterX1 &&
@@ -147,7 +147,7 @@
const char* inputColor,
const TransformedCoordsArray&,
const TextureSamplerArray&) SK_OVERRIDE;
- virtual void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE;
+ void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE;
static void GenKey(const GrProcessor&, const GrGLCaps& caps, GrProcessorKeyBuilder* b);
@@ -388,19 +388,19 @@
virtual ~FocalOutside2PtConicalEffect() { }
- virtual const char* name() const SK_OVERRIDE {
+ const char* name() const SK_OVERRIDE {
return "Two-Point Conical Gradient Focal Outside";
}
- virtual void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE;
+ void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE;
- virtual GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE;
+ GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE;
bool isFlipped() const { return fIsFlipped; }
SkScalar focal() const { return fFocalX; }
private:
- virtual bool onIsEqual(const GrFragmentProcessor& sBase) const SK_OVERRIDE {
+ bool onIsEqual(const GrFragmentProcessor& sBase) const SK_OVERRIDE {
const FocalOutside2PtConicalEffect& s = sBase.cast<FocalOutside2PtConicalEffect>();
return (INHERITED::onIsEqual(sBase) &&
this->fFocalX == s.fFocalX &&
@@ -435,7 +435,7 @@
const char* inputColor,
const TransformedCoordsArray&,
const TextureSamplerArray&) SK_OVERRIDE;
- virtual void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE;
+ void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE;
static void GenKey(const GrProcessor&, const GrGLCaps& caps, GrProcessorKeyBuilder* b);
@@ -610,20 +610,20 @@
virtual ~FocalInside2PtConicalEffect() {}
- virtual const char* name() const SK_OVERRIDE {
+ const char* name() const SK_OVERRIDE {
return "Two-Point Conical Gradient Focal Inside";
}
- virtual void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE;
+ void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE;
- virtual GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE;
+ GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE;
SkScalar focal() const { return fFocalX; }
typedef GLFocalInside2PtConicalEffect GLProcessor;
private:
- virtual bool onIsEqual(const GrFragmentProcessor& sBase) const SK_OVERRIDE {
+ bool onIsEqual(const GrFragmentProcessor& sBase) const SK_OVERRIDE {
const FocalInside2PtConicalEffect& s = sBase.cast<FocalInside2PtConicalEffect>();
return (INHERITED::onIsEqual(sBase) &&
this->fFocalX == s.fFocalX);
@@ -656,7 +656,7 @@
const char* inputColor,
const TransformedCoordsArray&,
const TextureSamplerArray&) SK_OVERRIDE;
- virtual void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE;
+ void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE;
static void GenKey(const GrProcessor&, const GrGLCaps& caps, GrProcessorKeyBuilder* b);
@@ -857,12 +857,12 @@
virtual ~CircleInside2PtConicalEffect() {}
- virtual const char* name() const SK_OVERRIDE { return "Two-Point Conical Gradient Inside"; }
+ const char* name() const SK_OVERRIDE { return "Two-Point Conical Gradient Inside"; }
virtual void getGLProcessorKey(const GrGLCaps& caps,
GrProcessorKeyBuilder* b) const SK_OVERRIDE;
- virtual GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE;
+ GrGLFragmentProcessor* createGLInstance() const SK_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:
- virtual bool onIsEqual(const GrFragmentProcessor& sBase) const SK_OVERRIDE {
+ bool onIsEqual(const GrFragmentProcessor& sBase) const SK_OVERRIDE {
const CircleInside2PtConicalEffect& s = sBase.cast<CircleInside2PtConicalEffect>();
return (INHERITED::onIsEqual(sBase) &&
this->fInfo.fCenterEnd == s.fInfo.fCenterEnd &&
@@ -907,7 +907,7 @@
const char* inputColor,
const TransformedCoordsArray&,
const TextureSamplerArray&) SK_OVERRIDE;
- virtual void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE;
+ void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE;
static void GenKey(const GrProcessor&, const GrGLCaps& caps, GrProcessorKeyBuilder* b);
@@ -1081,11 +1081,11 @@
virtual ~CircleOutside2PtConicalEffect() {}
- virtual const char* name() const SK_OVERRIDE { return "Two-Point Conical Gradient Outside"; }
+ const char* name() const SK_OVERRIDE { return "Two-Point Conical Gradient Outside"; }
- virtual void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE;
+ void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE;
- virtual GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE;
+ GrGLFragmentProcessor* createGLInstance() const SK_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:
- virtual bool onIsEqual(const GrFragmentProcessor& sBase) const SK_OVERRIDE {
+ bool onIsEqual(const GrFragmentProcessor& sBase) const SK_OVERRIDE {
const CircleOutside2PtConicalEffect& s = sBase.cast<CircleOutside2PtConicalEffect>();
return (INHERITED::onIsEqual(sBase) &&
this->fInfo.fCenterEnd == s.fInfo.fCenterEnd &&
@@ -1144,7 +1144,7 @@
const char* inputColor,
const TransformedCoordsArray&,
const TextureSamplerArray&) SK_OVERRIDE;
- virtual void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE;
+ void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE;
static void GenKey(const GrProcessor&, const GrGLCaps& caps, GrProcessorKeyBuilder* b);
diff --git a/src/effects/gradients/SkTwoPointRadialGradient.cpp b/src/effects/gradients/SkTwoPointRadialGradient.cpp
index 1a345bf..e0ea35e 100644
--- a/src/effects/gradients/SkTwoPointRadialGradient.cpp
+++ b/src/effects/gradients/SkTwoPointRadialGradient.cpp
@@ -406,7 +406,7 @@
const char* inputColor,
const TransformedCoordsArray&,
const TextureSamplerArray&) SK_OVERRIDE;
- virtual void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE;
+ void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE;
static void GenKey(const GrProcessor&, const GrGLCaps& caps, GrProcessorKeyBuilder* b);
@@ -447,14 +447,14 @@
virtual ~GrRadial2Gradient() { }
- virtual const char* name() const SK_OVERRIDE { return "Two-Point Radial Gradient"; }
+ const char* name() const SK_OVERRIDE { return "Two-Point Radial Gradient"; }
virtual void getGLProcessorKey(const GrGLCaps& caps,
GrProcessorKeyBuilder* b) const SK_OVERRIDE {
GrGLRadial2Gradient::GenKey(*this, caps, b);
}
- virtual GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE {
+ GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE {
return SkNEW_ARGS(GrGLRadial2Gradient, (*this));
}
@@ -465,7 +465,7 @@
bool isPosRoot() const { return SkToBool(fPosRoot); }
private:
- virtual bool onIsEqual(const GrFragmentProcessor& sBase) const SK_OVERRIDE {
+ bool onIsEqual(const GrFragmentProcessor& sBase) const SK_OVERRIDE {
const GrRadial2Gradient& s = sBase.cast<GrRadial2Gradient>();
return (INHERITED::onIsEqual(sBase) &&
this->fCenterX1 == s.fCenterX1 &&
diff --git a/src/effects/gradients/SkTwoPointRadialGradient.h b/src/effects/gradients/SkTwoPointRadialGradient.h
index 43f9f57..ece3858 100644
--- a/src/effects/gradients/SkTwoPointRadialGradient.h
+++ b/src/effects/gradients/SkTwoPointRadialGradient.h
@@ -20,18 +20,18 @@
virtual BitmapType asABitmap(SkBitmap* bitmap,
SkMatrix* matrix,
TileMode* xy) const SK_OVERRIDE;
- virtual GradientType asAGradient(GradientInfo* info) const SK_OVERRIDE;
+ GradientType asAGradient(GradientInfo* info) const SK_OVERRIDE;
virtual bool asFragmentProcessor(GrContext* context, const SkPaint&, const SkMatrix& viewM,
const SkMatrix*, GrColor*,
GrFragmentProcessor**) const SK_OVERRIDE;
- virtual size_t contextSize() const SK_OVERRIDE;
+ size_t contextSize() const SK_OVERRIDE;
class TwoPointRadialGradientContext : public SkGradientShaderBase::GradientShaderBaseContext {
public:
TwoPointRadialGradientContext(const SkTwoPointRadialGradient&, const ContextRec&);
- virtual void shadeSpan(int x, int y, SkPMColor dstC[], int count) SK_OVERRIDE;
+ void shadeSpan(int x, int y, SkPMColor dstC[], int count) SK_OVERRIDE;
private:
typedef SkGradientShaderBase::GradientShaderBaseContext INHERITED;
@@ -46,8 +46,8 @@
protected:
SkTwoPointRadialGradient(SkReadBuffer& buffer);
- virtual void flatten(SkWriteBuffer& buffer) const SK_OVERRIDE;
- virtual Context* onCreateContext(const ContextRec&, void* storage) const SK_OVERRIDE;
+ void flatten(SkWriteBuffer& buffer) const SK_OVERRIDE;
+ Context* onCreateContext(const ContextRec&, void* storage) const SK_OVERRIDE;
private:
const SkPoint fCenter1;