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

Unified Diff: src/gpu/GrOvalRenderer.cpp

Issue 806653007: Fix up all the easy virtual ... SK_OVERRIDE cases. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: rebase Created 5 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/gpu/GrInOrderDrawBuffer.h ('k') | src/gpu/GrPathRendering.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/GrOvalRenderer.cpp
diff --git a/src/gpu/GrOvalRenderer.cpp b/src/gpu/GrOvalRenderer.cpp
index b43c48561fcfc4b10bd83444dbeb4f2d8933981b..7f93bbe33916a0048ffbb4c9ba18463668c2ba16 100644
--- a/src/gpu/GrOvalRenderer.cpp
+++ b/src/gpu/GrOvalRenderer.cpp
@@ -73,7 +73,7 @@ public:
const GrAttribute* inCircleEdge() const { return fInCircleEdge; }
virtual ~CircleEdgeEffect() {}
- virtual const char* name() const SK_OVERRIDE { return "CircleEdge"; }
+ const char* name() const SK_OVERRIDE { return "CircleEdge"; }
inline bool isStroked() const { return fStroke; }
@@ -83,7 +83,7 @@ public:
const GrBatchTracker&)
: fColor(GrColor_ILLEGAL) {}
- virtual void emitCode(const EmitArgs& args) SK_OVERRIDE {
+ void emitCode(const EmitArgs& args) SK_OVERRIDE {
const CircleEdgeEffect& ce = args.fGP.cast<CircleEdgeEffect>();
GrGLGPBuilder* pb = args.fPB;
const BatchTracker& local = args.fBT.cast<BatchTracker>();
@@ -157,7 +157,7 @@ public:
GLProcessor::GenKey(*this, bt, caps, b);
}
- virtual GrGLGeometryProcessor* createGLInstance(const GrBatchTracker& bt) const SK_OVERRIDE {
+ GrGLGeometryProcessor* createGLInstance(const GrBatchTracker& bt) const SK_OVERRIDE {
return SkNEW_ARGS(GLProcessor, (*this, bt));
}
@@ -188,12 +188,12 @@ private:
fStroke = stroke;
}
- virtual bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE {
+ bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE {
const CircleEdgeEffect& cee = other.cast<CircleEdgeEffect>();
return cee.fStroke == fStroke;
}
- virtual void onGetInvariantOutputCoverage(GrInitInvariantOutput* out) const SK_OVERRIDE {
+ void onGetInvariantOutputCoverage(GrInitInvariantOutput* out) const SK_OVERRIDE {
out->setUnknownSingleComponent();
}
@@ -241,7 +241,7 @@ public:
virtual ~EllipseEdgeEffect() {}
- virtual const char* name() const SK_OVERRIDE { return "EllipseEdge"; }
+ const char* name() const SK_OVERRIDE { return "EllipseEdge"; }
const GrAttribute* inPosition() const { return fInPosition; }
const GrAttribute* inEllipseOffset() const { return fInEllipseOffset; }
@@ -255,7 +255,7 @@ public:
const GrBatchTracker&)
: fColor(GrColor_ILLEGAL) {}
- virtual void emitCode(const EmitArgs& args) SK_OVERRIDE {
+ void emitCode(const EmitArgs& args) SK_OVERRIDE {
const EllipseEdgeEffect& ee = args.fGP.cast<EllipseEdgeEffect>();
GrGLGPBuilder* pb = args.fPB;
const BatchTracker& local = args.fBT.cast<BatchTracker>();
@@ -351,7 +351,7 @@ public:
GLProcessor::GenKey(*this, bt, caps, b);
}
- virtual GrGLGeometryProcessor* createGLInstance(const GrBatchTracker& bt) const SK_OVERRIDE {
+ GrGLGeometryProcessor* createGLInstance(const GrBatchTracker& bt) const SK_OVERRIDE {
return SkNEW_ARGS(GLProcessor, (*this, bt));
}
@@ -384,12 +384,12 @@ private:
fStroke = stroke;
}
- virtual bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE {
+ bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE {
const EllipseEdgeEffect& eee = other.cast<EllipseEdgeEffect>();
return eee.fStroke == fStroke;
}
- virtual void onGetInvariantOutputCoverage(GrInitInvariantOutput* out) const SK_OVERRIDE {
+ void onGetInvariantOutputCoverage(GrInitInvariantOutput* out) const SK_OVERRIDE {
out->setUnknownSingleComponent();
}
@@ -441,7 +441,7 @@ public:
virtual ~DIEllipseEdgeEffect() {}
- virtual const char* name() const SK_OVERRIDE { return "DIEllipseEdge"; }
+ const char* name() const SK_OVERRIDE { return "DIEllipseEdge"; }
const GrAttribute* inPosition() const { return fInPosition; }
const GrAttribute* inEllipseOffsets0() const { return fInEllipseOffsets0; }
@@ -455,7 +455,7 @@ public:
const GrBatchTracker&)
: fColor(GrColor_ILLEGAL) {}
- virtual void emitCode(const EmitArgs& args) SK_OVERRIDE {
+ void emitCode(const EmitArgs& args) SK_OVERRIDE {
const DIEllipseEdgeEffect& ee = args.fGP.cast<DIEllipseEdgeEffect>();
GrGLGPBuilder* pb = args.fPB;
const BatchTracker& local = args.fBT.cast<BatchTracker>();
@@ -566,7 +566,7 @@ public:
GLProcessor::GenKey(*this, bt, caps, b);
}
- virtual GrGLGeometryProcessor* createGLInstance(const GrBatchTracker& bt) const SK_OVERRIDE {
+ GrGLGeometryProcessor* createGLInstance(const GrBatchTracker& bt) const SK_OVERRIDE {
return SkNEW_ARGS(GLProcessor, (*this, bt));
}
@@ -599,12 +599,12 @@ private:
fMode = mode;
}
- virtual bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE {
+ bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE {
const DIEllipseEdgeEffect& eee = other.cast<DIEllipseEdgeEffect>();
return eee.fMode == fMode;
}
- virtual void onGetInvariantOutputCoverage(GrInitInvariantOutput* out) const SK_OVERRIDE {
+ void onGetInvariantOutputCoverage(GrInitInvariantOutput* out) const SK_OVERRIDE {
out->setUnknownSingleComponent();
}
« no previous file with comments | « src/gpu/GrInOrderDrawBuffer.h ('k') | src/gpu/GrPathRendering.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698