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/gpu/GrAAConvexPathRenderer.cpp b/src/gpu/GrAAConvexPathRenderer.cpp
index fcf38ef..784f685 100644
--- a/src/gpu/GrAAConvexPathRenderer.cpp
+++ b/src/gpu/GrAAConvexPathRenderer.cpp
@@ -524,7 +524,7 @@
virtual ~QuadEdgeEffect() {}
- virtual const char* name() const SK_OVERRIDE { return "QuadEdge"; }
+ const char* name() const SK_OVERRIDE { return "QuadEdge"; }
const GrAttribute* inPosition() const { return fInPosition; }
const GrAttribute* inQuadEdge() const { return fInQuadEdge; }
@@ -535,7 +535,7 @@
const GrBatchTracker&)
: fColor(GrColor_ILLEGAL) {}
- virtual void emitCode(const EmitArgs& args) SK_OVERRIDE {
+ void emitCode(const EmitArgs& args) SK_OVERRIDE {
const QuadEdgeEffect& qe = args.fGP.cast<QuadEdgeEffect>();
GrGLGPBuilder* pb = args.fPB;
GrGLVertexBuilder* vsBuilder = pb->getVertexShaderBuilder();
@@ -622,7 +622,7 @@
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));
}
@@ -651,11 +651,11 @@
fInQuadEdge = &this->addVertexAttrib(GrAttribute("inQuadEdge", kVec4f_GrVertexAttribType));
}
- virtual bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE {
+ bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE {
return true;
}
- virtual void onGetInvariantOutputCoverage(GrInitInvariantOutput* out) const SK_OVERRIDE {
+ void onGetInvariantOutputCoverage(GrInitInvariantOutput* out) const SK_OVERRIDE {
out->setUnknownSingleComponent();
}
diff --git a/src/gpu/GrBitmapTextContext.h b/src/gpu/GrBitmapTextContext.h
index f1e6b03..bffacd5 100644
--- a/src/gpu/GrBitmapTextContext.h
+++ b/src/gpu/GrBitmapTextContext.h
@@ -39,7 +39,7 @@
GrBitmapTextContext(GrContext*, const SkDeviceProperties&);
- virtual bool canDraw(const SkPaint& paint, const SkMatrix& viewMatrix) SK_OVERRIDE;
+ bool canDraw(const SkPaint& paint, const SkMatrix& viewMatrix) SK_OVERRIDE;
virtual void onDrawText(const GrPaint&, const SkPaint&, const SkMatrix& viewMatrix,
const char text[], size_t byteLength,
diff --git a/src/gpu/GrDefaultGeoProcFactory.cpp b/src/gpu/GrDefaultGeoProcFactory.cpp
index b64c456..49c663d 100644
--- a/src/gpu/GrDefaultGeoProcFactory.cpp
+++ b/src/gpu/GrDefaultGeoProcFactory.cpp
@@ -35,7 +35,7 @@
coverage));
}
- virtual const char* name() const SK_OVERRIDE { return "DefaultGeometryProcessor"; }
+ const char* name() const SK_OVERRIDE { return "DefaultGeometryProcessor"; }
const GrAttribute* inPosition() const { return fInPosition; }
const GrAttribute* inColor() const { return fInColor; }
@@ -83,7 +83,7 @@
GLProcessor(const GrGeometryProcessor& gp, const GrBatchTracker&)
: fColor(GrColor_ILLEGAL), fCoverage(0xff) {}
- virtual void emitCode(const EmitArgs& args) SK_OVERRIDE {
+ void emitCode(const EmitArgs& args) SK_OVERRIDE {
const DefaultGeoProc& gp = args.fGP.cast<DefaultGeoProc>();
GrGLGPBuilder* pb = args.fPB;
GrGLVertexBuilder* vs = pb->getVertexShaderBuilder();
@@ -174,7 +174,7 @@
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));
}
@@ -212,12 +212,12 @@
}
}
- virtual bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE {
+ bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE {
const DefaultGeoProc& gp = other.cast<DefaultGeoProc>();
return gp.fFlags == this->fFlags;
}
- virtual void onGetInvariantOutputCoverage(GrInitInvariantOutput* out) const SK_OVERRIDE {
+ void onGetInvariantOutputCoverage(GrInitInvariantOutput* out) const SK_OVERRIDE {
if (fInCoverage) {
out->setUnknownSingleComponent();
} else {
diff --git a/src/gpu/GrDistanceFieldTextContext.h b/src/gpu/GrDistanceFieldTextContext.h
index 8f73b06..c2d0b6d 100644
--- a/src/gpu/GrDistanceFieldTextContext.h
+++ b/src/gpu/GrDistanceFieldTextContext.h
@@ -50,7 +50,7 @@
GrDistanceFieldTextContext(GrContext*, const SkDeviceProperties&, bool enable);
- virtual bool canDraw(const SkPaint& paint, const SkMatrix& viewMatrix) SK_OVERRIDE;
+ bool canDraw(const SkPaint& paint, const SkMatrix& viewMatrix) SK_OVERRIDE;
virtual void onDrawText(const GrPaint&, const SkPaint&, const SkMatrix& viewMatrix,
const char text[], size_t byteLength,
diff --git a/src/gpu/GrDrawTarget.h b/src/gpu/GrDrawTarget.h
index b1d1492..0e211ba 100644
--- a/src/gpu/GrDrawTarget.h
+++ b/src/gpu/GrDrawTarget.h
@@ -837,7 +837,7 @@
* Release any resources that are cached but not currently in use. This
* is intended to give an application some recourse when resources are low.
*/
- virtual void purgeResources() SK_OVERRIDE {
+ void purgeResources() SK_OVERRIDE {
// The clip mask manager can rebuild all its clip masks so just
// get rid of them all.
fClipMaskManager.purgeResources();
diff --git a/src/gpu/GrGeometryProcessor.h b/src/gpu/GrGeometryProcessor.h
index d88f3e6..ad75d23 100644
--- a/src/gpu/GrGeometryProcessor.h
+++ b/src/gpu/GrGeometryProcessor.h
@@ -375,7 +375,7 @@
const GrGLCaps& caps,
GrProcessorKeyBuilder* b) const SK_OVERRIDE;
- virtual GrGLGeometryProcessor* createGLInstance(const GrBatchTracker& bt) const SK_OVERRIDE;
+ GrGLGeometryProcessor* createGLInstance(const GrBatchTracker& bt) const SK_OVERRIDE;
private:
GrPathProcessor(GrColor color, const SkMatrix& viewMatrix, const SkMatrix& localMatrix);
diff --git a/src/gpu/GrInOrderDrawBuffer.h b/src/gpu/GrInOrderDrawBuffer.h
index 5a616e1..d415e49 100644
--- a/src/gpu/GrInOrderDrawBuffer.h
+++ b/src/gpu/GrInOrderDrawBuffer.h
@@ -256,7 +256,7 @@
// Records any trace markers for a command after adding it to the buffer.
void recordTraceMarkersIfNecessary();
- virtual bool isIssued(uint32_t drawID) SK_OVERRIDE { return drawID != fDrawID; }
+ bool isIssued(uint32_t drawID) SK_OVERRIDE { return drawID != fDrawID; }
// TODO: Use a single allocator for commands and records
enum {
diff --git a/src/gpu/GrOvalRenderer.cpp b/src/gpu/GrOvalRenderer.cpp
index b43c485..7f93bbe 100644
--- a/src/gpu/GrOvalRenderer.cpp
+++ b/src/gpu/GrOvalRenderer.cpp
@@ -73,7 +73,7 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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();
}
diff --git a/src/gpu/GrPathRendering.cpp b/src/gpu/GrPathRendering.cpp
index 1b0ce19..c7f2d9d 100644
--- a/src/gpu/GrPathRendering.cpp
+++ b/src/gpu/GrPathRendering.cpp
@@ -24,11 +24,11 @@
SkDescriptor::Free(fDesc);
}
- virtual int getNumPaths() SK_OVERRIDE {
+ int getNumPaths() SK_OVERRIDE {
return fScalerContext->getGlyphCount();
}
- virtual void generatePath(int glyphID, SkPath* out) SK_OVERRIDE {
+ void generatePath(int glyphID, SkPath* out) SK_OVERRIDE {
SkGlyph skGlyph;
skGlyph.init(SkGlyph::MakeID(glyphID));
fScalerContext->getMetrics(&skGlyph);
@@ -37,7 +37,7 @@
out->transform(fFlipMatrix); // Load glyphs with the inverted y-direction.
}
- virtual bool isEqualTo(const SkDescriptor& desc) const SK_OVERRIDE {
+ bool isEqualTo(const SkDescriptor& desc) const SK_OVERRIDE {
return fDesc->equals(desc);
}
diff --git a/src/gpu/GrRectanizer_pow2.h b/src/gpu/GrRectanizer_pow2.h
index 7bf2b86..59ef864 100644
--- a/src/gpu/GrRectanizer_pow2.h
+++ b/src/gpu/GrRectanizer_pow2.h
@@ -24,15 +24,15 @@
virtual ~GrRectanizerPow2() { }
- virtual void reset() SK_OVERRIDE {
+ void reset() SK_OVERRIDE {
fNextStripY = 0;
fAreaSoFar = 0;
sk_bzero(fRows, sizeof(fRows));
}
- virtual bool addRect(int w, int h, SkIPoint16* loc) SK_OVERRIDE;
+ bool addRect(int w, int h, SkIPoint16* loc) SK_OVERRIDE;
- virtual float percentFull() const SK_OVERRIDE {
+ float percentFull() const SK_OVERRIDE {
return fAreaSoFar / ((float)this->width() * this->height());
}
diff --git a/src/gpu/GrRectanizer_skyline.h b/src/gpu/GrRectanizer_skyline.h
index 21043c0..c9f9255 100644
--- a/src/gpu/GrRectanizer_skyline.h
+++ b/src/gpu/GrRectanizer_skyline.h
@@ -21,7 +21,7 @@
virtual ~GrRectanizerSkyline() { }
- virtual void reset() SK_OVERRIDE{
+ void reset() SK_OVERRIDE{
fAreaSoFar = 0;
fSkyline.reset();
SkylineSegment* seg = fSkyline.append(1);
@@ -30,9 +30,9 @@
seg->fWidth = this->width();
}
- virtual bool addRect(int w, int h, SkIPoint16* loc) SK_OVERRIDE;
+ bool addRect(int w, int h, SkIPoint16* loc) SK_OVERRIDE;
- virtual float percentFull() const SK_OVERRIDE {
+ float percentFull() const SK_OVERRIDE {
return fAreaSoFar / ((float)this->width() * this->height());
}
diff --git a/src/gpu/GrStencilAndCoverTextContext.h b/src/gpu/GrStencilAndCoverTextContext.h
index 89c94eb..c7b06cc 100644
--- a/src/gpu/GrStencilAndCoverTextContext.h
+++ b/src/gpu/GrStencilAndCoverTextContext.h
@@ -69,7 +69,7 @@
GrStencilAndCoverTextContext(GrContext*, const SkDeviceProperties&);
- virtual bool canDraw(const SkPaint& paint, const SkMatrix& viewMatrix) SK_OVERRIDE;
+ bool canDraw(const SkPaint& paint, const SkMatrix& viewMatrix) SK_OVERRIDE;
virtual void onDrawText(const GrPaint&, const SkPaint&, const SkMatrix& viewMatrix,
const char text[], size_t byteLength,
diff --git a/src/gpu/SkGpuDevice.h b/src/gpu/SkGpuDevice.h
index 7731100..56dad1b 100644
--- a/src/gpu/SkGpuDevice.h
+++ b/src/gpu/SkGpuDevice.h
@@ -68,13 +68,13 @@
// set all pixels to 0
void clearAll();
- virtual GrRenderTarget* accessRenderTarget() SK_OVERRIDE;
+ GrRenderTarget* accessRenderTarget() SK_OVERRIDE;
- virtual SkImageInfo imageInfo() const SK_OVERRIDE {
+ SkImageInfo imageInfo() const SK_OVERRIDE {
return fRenderTarget ? fRenderTarget->surfacePriv().info() : SkImageInfo::MakeUnknown();
}
- virtual void drawPaint(const SkDraw&, const SkPaint& paint) SK_OVERRIDE;
+ void drawPaint(const SkDraw&, const SkPaint& paint) SK_OVERRIDE;
virtual void drawPoints(const SkDraw&, SkCanvas::PointMode mode, size_t count,
const SkPoint[], const SkPaint& paint) SK_OVERRIDE;
virtual void drawRect(const SkDraw&, const SkRect& r,
@@ -112,14 +112,14 @@
virtual void drawDevice(const SkDraw&, SkBaseDevice*, int x, int y,
const SkPaint&) SK_OVERRIDE;
- virtual void flush() SK_OVERRIDE;
+ void flush() SK_OVERRIDE;
- virtual void onAttachToCanvas(SkCanvas* canvas) SK_OVERRIDE;
- virtual void onDetachFromCanvas() SK_OVERRIDE;
+ void onAttachToCanvas(SkCanvas* canvas) SK_OVERRIDE;
+ void onDetachFromCanvas() SK_OVERRIDE;
- virtual const SkBitmap& onAccessBitmap() SK_OVERRIDE;
+ const SkBitmap& onAccessBitmap() SK_OVERRIDE;
- virtual bool canHandleImageFilter(const SkImageFilter*) SK_OVERRIDE;
+ bool canHandleImageFilter(const SkImageFilter*) SK_OVERRIDE;
virtual bool filterImage(const SkImageFilter*, const SkBitmap&,
const SkImageFilter::Context&,
SkBitmap*, SkIPoint*) SK_OVERRIDE;
@@ -129,8 +129,8 @@
SkBitmap* result, SkIPoint* offset);
protected:
- virtual bool onReadPixels(const SkImageInfo&, void*, size_t, int, int) SK_OVERRIDE;
- virtual bool onWritePixels(const SkImageInfo&, const void*, size_t, int, int) SK_OVERRIDE;
+ bool onReadPixels(const SkImageInfo&, void*, size_t, int, int) SK_OVERRIDE;
+ bool onWritePixels(const SkImageInfo&, const void*, size_t, int, int) SK_OVERRIDE;
bool onShouldDisableLCD(const SkPaint&) const SK_OVERRIDE;
/** PRIVATE / EXPERIMENTAL -- do not call */
@@ -155,13 +155,13 @@
SkGpuDevice(GrSurface*, const SkSurfaceProps&, unsigned flags = 0);
- virtual SkBaseDevice* onCreateCompatibleDevice(const CreateInfo&) SK_OVERRIDE;
+ SkBaseDevice* onCreateCompatibleDevice(const CreateInfo&) SK_OVERRIDE;
- virtual SkSurface* newSurface(const SkImageInfo&, const SkSurfaceProps&) SK_OVERRIDE;
+ SkSurface* newSurface(const SkImageInfo&, const SkSurfaceProps&) SK_OVERRIDE;
- virtual SkImageFilter::Cache* getImageFilterCache() SK_OVERRIDE;
+ SkImageFilter::Cache* getImageFilterCache() SK_OVERRIDE;
- virtual bool forceConservativeRasterClip() const SK_OVERRIDE { return true; }
+ bool forceConservativeRasterClip() const SK_OVERRIDE { return true; }
// sets the render target and clip on context
void prepareDraw(const SkDraw&);
diff --git a/src/gpu/SkGr.cpp b/src/gpu/SkGr.cpp
index d1fc6f0..49d3c6b 100644
--- a/src/gpu/SkGr.cpp
+++ b/src/gpu/SkGr.cpp
@@ -122,7 +122,7 @@
private:
GrResourceKey fKey;
- virtual void onChange() SK_OVERRIDE {
+ void onChange() SK_OVERRIDE {
const GrResourceInvalidatedMessage message = { fKey };
SkMessageBus<GrResourceInvalidatedMessage>::Post(message);
}
diff --git a/src/gpu/effects/GrBezierEffect.cpp b/src/gpu/effects/GrBezierEffect.cpp
index e846b79..e16601d 100644
--- a/src/gpu/effects/GrBezierEffect.cpp
+++ b/src/gpu/effects/GrBezierEffect.cpp
@@ -24,7 +24,7 @@
GrGLConicEffect(const GrGeometryProcessor&,
const GrBatchTracker&);
- virtual void emitCode(const EmitArgs&) SK_OVERRIDE;
+ void emitCode(const EmitArgs&) SK_OVERRIDE;
static inline void GenKey(const GrGeometryProcessor&,
const GrBatchTracker&,
@@ -258,7 +258,7 @@
GrGLQuadEffect(const GrGeometryProcessor&,
const GrBatchTracker&);
- virtual void emitCode(const EmitArgs&) SK_OVERRIDE;
+ void emitCode(const EmitArgs&) SK_OVERRIDE;
static inline void GenKey(const GrGeometryProcessor&,
const GrBatchTracker&,
@@ -478,7 +478,7 @@
GrGLCubicEffect(const GrGeometryProcessor&,
const GrBatchTracker&);
- virtual void emitCode(const EmitArgs&) SK_OVERRIDE;
+ void emitCode(const EmitArgs&) SK_OVERRIDE;
static inline void GenKey(const GrGeometryProcessor&,
const GrBatchTracker&,
diff --git a/src/gpu/effects/GrBezierEffect.h b/src/gpu/effects/GrBezierEffect.h
index 1bd93b6..f31542f 100644
--- a/src/gpu/effects/GrBezierEffect.h
+++ b/src/gpu/effects/GrBezierEffect.h
@@ -90,7 +90,7 @@
virtual ~GrConicEffect();
- virtual const char* name() const SK_OVERRIDE { return "Conic"; }
+ const char* name() const SK_OVERRIDE { return "Conic"; }
inline const GrAttribute* inPosition() const { return fInPosition; }
inline const GrAttribute* inConicCoeffs() const { return fInConicCoeffs; }
@@ -102,7 +102,7 @@
const GrGLCaps& caps,
GrProcessorKeyBuilder* b) const SK_OVERRIDE;
- virtual GrGLGeometryProcessor* createGLInstance(const GrBatchTracker& bt) const SK_OVERRIDE;
+ GrGLGeometryProcessor* createGLInstance(const GrBatchTracker& bt) const SK_OVERRIDE;
void initBatchTracker(GrBatchTracker*, const InitBT&) const SK_OVERRIDE;
bool onCanMakeEqual(const GrBatchTracker&,
@@ -113,9 +113,9 @@
GrConicEffect(GrColor, const SkMatrix& viewMatrix, uint8_t coverage, GrPrimitiveEdgeType,
const SkMatrix& localMatrix);
- virtual bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE;
+ bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE;
- virtual void onGetInvariantOutputCoverage(GrInitInvariantOutput* out) const SK_OVERRIDE {
+ void onGetInvariantOutputCoverage(GrInitInvariantOutput* out) const SK_OVERRIDE {
out->setUnknownSingleComponent();
}
@@ -174,7 +174,7 @@
virtual ~GrQuadEffect();
- virtual const char* name() const SK_OVERRIDE { return "Quad"; }
+ const char* name() const SK_OVERRIDE { return "Quad"; }
inline const GrAttribute* inPosition() const { return fInPosition; }
inline const GrAttribute* inHairQuadEdge() const { return fInHairQuadEdge; }
@@ -186,7 +186,7 @@
const GrGLCaps& caps,
GrProcessorKeyBuilder* b) const SK_OVERRIDE;
- virtual GrGLGeometryProcessor* createGLInstance(const GrBatchTracker& bt) const SK_OVERRIDE;
+ GrGLGeometryProcessor* createGLInstance(const GrBatchTracker& bt) const SK_OVERRIDE;
void initBatchTracker(GrBatchTracker*, const InitBT&) const SK_OVERRIDE;
bool onCanMakeEqual(const GrBatchTracker&,
@@ -197,9 +197,9 @@
GrQuadEffect(GrColor, const SkMatrix& viewMatrix, uint8_t coverage, GrPrimitiveEdgeType,
const SkMatrix& localMatrix);
- virtual bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE;
+ bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE;
- virtual void onGetInvariantOutputCoverage(GrInitInvariantOutput* out) const SK_OVERRIDE {
+ void onGetInvariantOutputCoverage(GrInitInvariantOutput* out) const SK_OVERRIDE {
out->setUnknownSingleComponent();
}
@@ -254,7 +254,7 @@
virtual ~GrCubicEffect();
- virtual const char* name() const SK_OVERRIDE { return "Cubic"; }
+ const char* name() const SK_OVERRIDE { return "Cubic"; }
inline const GrAttribute* inPosition() const { return fInPosition; }
inline const GrAttribute* inCubicCoeffs() const { return fInCubicCoeffs; }
@@ -266,7 +266,7 @@
const GrGLCaps& caps,
GrProcessorKeyBuilder* b) const SK_OVERRIDE;
- virtual GrGLGeometryProcessor* createGLInstance(const GrBatchTracker& bt) const SK_OVERRIDE;
+ GrGLGeometryProcessor* createGLInstance(const GrBatchTracker& bt) const SK_OVERRIDE;
void initBatchTracker(GrBatchTracker*, const InitBT&) const SK_OVERRIDE;
bool onCanMakeEqual(const GrBatchTracker&,
@@ -276,9 +276,9 @@
private:
GrCubicEffect(GrColor, const SkMatrix& viewMatrix, GrPrimitiveEdgeType);
- virtual bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE;
+ bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE;
- virtual void onGetInvariantOutputCoverage(GrInitInvariantOutput* out) const SK_OVERRIDE {
+ void onGetInvariantOutputCoverage(GrInitInvariantOutput* out) const SK_OVERRIDE {
out->setUnknownSingleComponent();
}
diff --git a/src/gpu/effects/GrBicubicEffect.cpp b/src/gpu/effects/GrBicubicEffect.cpp
index 76edff0..7d2dbf4 100644
--- a/src/gpu/effects/GrBicubicEffect.cpp
+++ b/src/gpu/effects/GrBicubicEffect.cpp
@@ -30,7 +30,7 @@
const TransformedCoordsArray&,
const TextureSamplerArray&) SK_OVERRIDE;
- virtual void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE;
+ void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE;
static inline void GenKey(const GrProcessor& effect, const GrGLCaps&,
GrProcessorKeyBuilder* b) {
diff --git a/src/gpu/effects/GrBicubicEffect.h b/src/gpu/effects/GrBicubicEffect.h
index 19fce03..89e43c1 100644
--- a/src/gpu/effects/GrBicubicEffect.h
+++ b/src/gpu/effects/GrBicubicEffect.h
@@ -25,11 +25,11 @@
const float* coefficients() const { return fCoefficients; }
- virtual const char* name() const SK_OVERRIDE { return "Bicubic"; }
+ const char* name() const SK_OVERRIDE { return "Bicubic"; }
- 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;
const GrTextureDomain& domain() const { return fDomain; }
@@ -91,9 +91,9 @@
const SkMatrix &matrix, const SkShader::TileMode tileModes[2]);
GrBicubicEffect(GrTexture*, const SkScalar coefficients[16],
const SkMatrix &matrix, const SkRect& domain);
- 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;
float fCoefficients[16];
GrTextureDomain fDomain;
diff --git a/src/gpu/effects/GrBitmapTextGeoProc.cpp b/src/gpu/effects/GrBitmapTextGeoProc.cpp
index 5f44d32..1cfb644 100644
--- a/src/gpu/effects/GrBitmapTextGeoProc.cpp
+++ b/src/gpu/effects/GrBitmapTextGeoProc.cpp
@@ -25,7 +25,7 @@
GrGLBitmapTextGeoProc(const GrGeometryProcessor&, const GrBatchTracker&)
: fColor(GrColor_ILLEGAL) {}
- virtual void emitCode(const EmitArgs& args) SK_OVERRIDE {
+ void emitCode(const EmitArgs& args) SK_OVERRIDE {
const GrBitmapTextGeoProc& cte = args.fGP.cast<GrBitmapTextGeoProc>();
const BitmapTextBatchTracker& local = args.fBT.cast<BitmapTextBatchTracker>();
diff --git a/src/gpu/effects/GrBitmapTextGeoProc.h b/src/gpu/effects/GrBitmapTextGeoProc.h
index c69ffd7..85e4f42 100644
--- a/src/gpu/effects/GrBitmapTextGeoProc.h
+++ b/src/gpu/effects/GrBitmapTextGeoProc.h
@@ -30,7 +30,7 @@
virtual ~GrBitmapTextGeoProc() {}
- virtual const char* name() const SK_OVERRIDE { return "Texture"; }
+ const char* name() const SK_OVERRIDE { return "Texture"; }
const GrAttribute* inPosition() const { return fInPosition; }
const GrAttribute* inColor() const { return fInColor; }
@@ -40,7 +40,7 @@
const GrGLCaps& caps,
GrProcessorKeyBuilder* b) const SK_OVERRIDE;
- virtual GrGLGeometryProcessor* createGLInstance(const GrBatchTracker& bt) const SK_OVERRIDE;
+ GrGLGeometryProcessor* createGLInstance(const GrBatchTracker& bt) const SK_OVERRIDE;
void initBatchTracker(GrBatchTracker*, const InitBT&) const SK_OVERRIDE;
bool onCanMakeEqual(const GrBatchTracker&,
@@ -51,9 +51,9 @@
GrBitmapTextGeoProc(GrColor, GrTexture* texture, const GrTextureParams& params,
bool useColorAttrib, bool opaqueVertexColors, const SkMatrix& localMatrix);
- virtual bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE;
+ bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE;
- virtual void onGetInvariantOutputCoverage(GrInitInvariantOutput*) const SK_OVERRIDE;
+ void onGetInvariantOutputCoverage(GrInitInvariantOutput*) const SK_OVERRIDE;
GrTextureAccess fTextureAccess;
const GrAttribute* fInPosition;
diff --git a/src/gpu/effects/GrConfigConversionEffect.h b/src/gpu/effects/GrConfigConversionEffect.h
index d85e783..5760bb4 100644
--- a/src/gpu/effects/GrConfigConversionEffect.h
+++ b/src/gpu/effects/GrConfigConversionEffect.h
@@ -37,11 +37,11 @@
static const GrFragmentProcessor* Create(GrTexture*, bool swapRedAndBlue, PMConversion,
const SkMatrix&);
- virtual const char* name() const SK_OVERRIDE { return "Config Conversion"; }
+ const char* name() const SK_OVERRIDE { return "Config Conversion"; }
- 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 swapsRedAndBlue() const { return fSwapRedAndBlue; }
PMConversion pmConversion() const { return fPMConversion; }
@@ -61,9 +61,9 @@
PMConversion pmConversion,
const SkMatrix& matrix);
- 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;
bool fSwapRedAndBlue;
PMConversion fPMConversion;
diff --git a/src/gpu/effects/GrConvexPolyEffect.cpp b/src/gpu/effects/GrConvexPolyEffect.cpp
index 1430716..7035094 100644
--- a/src/gpu/effects/GrConvexPolyEffect.cpp
+++ b/src/gpu/effects/GrConvexPolyEffect.cpp
@@ -23,11 +23,11 @@
GrPrimitiveEdgeType getEdgeType() const { return fEdgeType; }
- virtual const char* name() const SK_OVERRIDE { return "AARect"; }
+ const char* name() const SK_OVERRIDE { return "AARect"; }
- 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;
private:
AARectEffect(GrPrimitiveEdgeType edgeType, const SkRect& rect)
@@ -36,12 +36,12 @@
this->setWillReadFragmentPosition();
}
- virtual bool onIsEqual(const GrFragmentProcessor& other) const SK_OVERRIDE {
+ bool onIsEqual(const GrFragmentProcessor& other) const SK_OVERRIDE {
const AARectEffect& aare = other.cast<AARectEffect>();
return fRect == aare.fRect;
}
- virtual void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE {
+ void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE {
if (fRect.isEmpty()) {
// An empty rect will have no coverage anywhere.
inout->mulByKnownSingleComponent(0);
@@ -94,7 +94,7 @@
static inline void GenKey(const GrProcessor&, const GrGLCaps&, GrProcessorKeyBuilder*);
- virtual void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE;
+ void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE;
private:
GrGLProgramDataManager::UniformHandle fRectUniform;
@@ -189,7 +189,7 @@
static inline void GenKey(const GrProcessor&, const GrGLCaps&, GrProcessorKeyBuilder*);
- virtual void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE;
+ void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE;
private:
GrGLProgramDataManager::UniformHandle fEdgeUniform;
diff --git a/src/gpu/effects/GrConvexPolyEffect.h b/src/gpu/effects/GrConvexPolyEffect.h
index fec7e82..e0eee5d 100644
--- a/src/gpu/effects/GrConvexPolyEffect.h
+++ b/src/gpu/effects/GrConvexPolyEffect.h
@@ -61,7 +61,7 @@
virtual ~GrConvexPolyEffect();
- virtual const char* name() const SK_OVERRIDE { return "ConvexPoly"; }
+ const char* name() const SK_OVERRIDE { return "ConvexPoly"; }
GrPrimitiveEdgeType getEdgeType() const { return fEdgeType; }
@@ -69,16 +69,16 @@
const SkScalar* getEdges() const { return fEdges; }
- 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;
private:
GrConvexPolyEffect(GrPrimitiveEdgeType edgeType, int n, const SkScalar edges[]);
- virtual bool onIsEqual(const GrFragmentProcessor& other) const SK_OVERRIDE;
+ bool onIsEqual(const GrFragmentProcessor& other) const SK_OVERRIDE;
- virtual void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE;
+ void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE;
GrPrimitiveEdgeType fEdgeType;
int fEdgeCount;
diff --git a/src/gpu/effects/GrConvolutionEffect.cpp b/src/gpu/effects/GrConvolutionEffect.cpp
index e3f051b..ef892dc 100644
--- a/src/gpu/effects/GrConvolutionEffect.cpp
+++ b/src/gpu/effects/GrConvolutionEffect.cpp
@@ -25,7 +25,7 @@
const TransformedCoordsArray&,
const TextureSamplerArray&) SK_OVERRIDE;
- virtual void setData(const GrGLProgramDataManager& pdman, const GrProcessor&) SK_OVERRIDE;
+ void setData(const GrGLProgramDataManager& pdman, const GrProcessor&) SK_OVERRIDE;
static inline void GenKey(const GrProcessor&, const GrGLCaps&, GrProcessorKeyBuilder*);
diff --git a/src/gpu/effects/GrConvolutionEffect.h b/src/gpu/effects/GrConvolutionEffect.h
index 0d1226b..4ea436c 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; }
- virtual const char* name() const SK_OVERRIDE { return "Convolution"; }
+ const char* name() const SK_OVERRIDE { return "Convolution"; }
- 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;
enum {
// This was decided based on the min allowed value for the max texture
@@ -94,9 +94,9 @@
bool useBounds,
float bounds[2]);
- 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 {
// If the texture was opaque we could know that the output color if we knew the sum of the
// kernel values.
inout->mulByUnknownFourComponents();
diff --git a/src/gpu/effects/GrDashingEffect.cpp b/src/gpu/effects/GrDashingEffect.cpp
index 47b8d65..8b69dca 100644
--- a/src/gpu/effects/GrDashingEffect.cpp
+++ b/src/gpu/effects/GrDashingEffect.cpp
@@ -478,7 +478,7 @@
virtual ~DashingCircleEffect();
- virtual const char* name() const SK_OVERRIDE { return "DashingCircleEffect"; }
+ const char* name() const SK_OVERRIDE { return "DashingCircleEffect"; }
const GrAttribute* inPosition() const { return fInPosition; }
@@ -496,7 +496,7 @@
const GrGLCaps&,
GrProcessorKeyBuilder* b) const SK_OVERRIDE;
- virtual GrGLGeometryProcessor* createGLInstance(const GrBatchTracker&) const SK_OVERRIDE;
+ GrGLGeometryProcessor* createGLInstance(const GrBatchTracker&) const SK_OVERRIDE;
void initBatchTracker(GrBatchTracker* bt, const InitBT& init) const SK_OVERRIDE;
@@ -508,9 +508,9 @@
DashingCircleEffect(GrColor, GrPrimitiveEdgeType edgeType, const DashInfo& info,
SkScalar radius, const SkMatrix& localMatrix);
- virtual bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE;
+ bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE;
- virtual void onGetInvariantOutputCoverage(GrInitInvariantOutput*) const SK_OVERRIDE;
+ void onGetInvariantOutputCoverage(GrInitInvariantOutput*) const SK_OVERRIDE;
GrPrimitiveEdgeType fEdgeType;
const GrAttribute* fInPosition;
@@ -530,7 +530,7 @@
public:
GLDashingCircleEffect(const GrGeometryProcessor&, const GrBatchTracker&);
- virtual void emitCode(const EmitArgs&) SK_OVERRIDE;
+ void emitCode(const EmitArgs&) SK_OVERRIDE;
static inline void GenKey(const GrGeometryProcessor&,
const GrBatchTracker&,
@@ -767,7 +767,7 @@
virtual ~DashingLineEffect();
- virtual const char* name() const SK_OVERRIDE { return "DashingEffect"; }
+ const char* name() const SK_OVERRIDE { return "DashingEffect"; }
const GrAttribute* inPosition() const { return fInPosition; }
@@ -783,7 +783,7 @@
const GrGLCaps& caps,
GrProcessorKeyBuilder* b) const SK_OVERRIDE;
- virtual GrGLGeometryProcessor* createGLInstance(const GrBatchTracker& bt) const SK_OVERRIDE;
+ GrGLGeometryProcessor* createGLInstance(const GrBatchTracker& bt) const SK_OVERRIDE;
void initBatchTracker(GrBatchTracker* bt, const InitBT& init) const SK_OVERRIDE;
@@ -795,9 +795,9 @@
DashingLineEffect(GrColor, GrPrimitiveEdgeType edgeType, const DashInfo& info,
SkScalar strokeWidth, const SkMatrix& localMatrix);
- virtual bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE;
+ bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE;
- virtual void onGetInvariantOutputCoverage(GrInitInvariantOutput*) const SK_OVERRIDE;
+ void onGetInvariantOutputCoverage(GrInitInvariantOutput*) const SK_OVERRIDE;
GrPrimitiveEdgeType fEdgeType;
const GrAttribute* fInPosition;
@@ -816,7 +816,7 @@
public:
GLDashingLineEffect(const GrGeometryProcessor&, const GrBatchTracker&);
- virtual void emitCode(const EmitArgs&) SK_OVERRIDE;
+ void emitCode(const EmitArgs&) SK_OVERRIDE;
static inline void GenKey(const GrGeometryProcessor&,
const GrBatchTracker&,
diff --git a/src/gpu/effects/GrDistanceFieldTextureEffect.cpp b/src/gpu/effects/GrDistanceFieldTextureEffect.cpp
index 21fbb30..cdb6ff7 100755
--- a/src/gpu/effects/GrDistanceFieldTextureEffect.cpp
+++ b/src/gpu/effects/GrDistanceFieldTextureEffect.cpp
@@ -35,7 +35,7 @@
#endif
{}
- virtual void emitCode(const EmitArgs& args) SK_OVERRIDE {
+ void emitCode(const EmitArgs& args) SK_OVERRIDE {
const GrDistanceFieldTextureEffect& dfTexEffect =
args.fGP.cast<GrDistanceFieldTextureEffect>();
const DistanceFieldBatchTracker& local = args.fBT.cast<DistanceFieldBatchTracker>();
@@ -321,7 +321,7 @@
const GrBatchTracker&)
: fColor(GrColor_ILLEGAL), fTextureSize(SkISize::Make(-1, -1)) {}
- virtual void emitCode(const EmitArgs& args) SK_OVERRIDE {
+ void emitCode(const EmitArgs& args) SK_OVERRIDE {
const GrDistanceFieldNoGammaTextureEffect& dfTexEffect =
args.fGP.cast<GrDistanceFieldNoGammaTextureEffect>();
@@ -562,7 +562,7 @@
, fTextureSize(SkISize::Make(-1,-1))
, fTextColor(GrColor_ILLEGAL) {}
- virtual void emitCode(const EmitArgs& args) SK_OVERRIDE {
+ void emitCode(const EmitArgs& args) SK_OVERRIDE {
const GrDistanceFieldLCDTextureEffect& dfTexEffect =
args.fGP.cast<GrDistanceFieldLCDTextureEffect>();
const DistanceFieldLCDBatchTracker& local = args.fBT.cast<DistanceFieldLCDBatchTracker>();
diff --git a/src/gpu/effects/GrDistanceFieldTextureEffect.h b/src/gpu/effects/GrDistanceFieldTextureEffect.h
index 1be06df..6edcf98 100644
--- a/src/gpu/effects/GrDistanceFieldTextureEffect.h
+++ b/src/gpu/effects/GrDistanceFieldTextureEffect.h
@@ -66,7 +66,7 @@
virtual ~GrDistanceFieldTextureEffect() {}
- virtual const char* name() const SK_OVERRIDE { return "DistanceFieldTexture"; }
+ const char* name() const SK_OVERRIDE { return "DistanceFieldTexture"; }
const GrAttribute* inPosition() const { return fInPosition; }
const GrAttribute* inColor() const { return fInColor; }
@@ -80,7 +80,7 @@
const GrGLCaps& caps,
GrProcessorKeyBuilder* b) const SK_OVERRIDE;
- virtual GrGLGeometryProcessor* createGLInstance(const GrBatchTracker& bt) const SK_OVERRIDE;
+ GrGLGeometryProcessor* createGLInstance(const GrBatchTracker& bt) const SK_OVERRIDE;
void initBatchTracker(GrBatchTracker* bt, const InitBT& init) const SK_OVERRIDE;
@@ -96,9 +96,9 @@
#endif
uint32_t flags, bool opaqueVertexColors);
- virtual bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE;
+ bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE;
- virtual void onGetInvariantOutputCoverage(GrInitInvariantOutput*) const SK_OVERRIDE;
+ void onGetInvariantOutputCoverage(GrInitInvariantOutput*) const SK_OVERRIDE;
GrTextureAccess fTextureAccess;
#ifdef SK_GAMMA_APPLY_TO_A8
@@ -133,7 +133,7 @@
virtual ~GrDistanceFieldNoGammaTextureEffect() {}
- virtual const char* name() const SK_OVERRIDE { return "DistanceFieldTexture"; }
+ const char* name() const SK_OVERRIDE { return "DistanceFieldTexture"; }
const GrAttribute* inPosition() const { return fInPosition; }
const GrAttribute* inColor() const { return fInColor; }
@@ -144,7 +144,7 @@
const GrGLCaps& caps,
GrProcessorKeyBuilder* b) const SK_OVERRIDE;
- virtual GrGLGeometryProcessor* createGLInstance(const GrBatchTracker& bt) const SK_OVERRIDE;
+ GrGLGeometryProcessor* createGLInstance(const GrBatchTracker& bt) const SK_OVERRIDE;
void initBatchTracker(GrBatchTracker* bt, const InitBT& init) const SK_OVERRIDE;
@@ -157,9 +157,9 @@
const GrTextureParams& params, uint32_t flags,
bool opaqueVertexColors);
- virtual bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE;
+ bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE;
- virtual void onGetInvariantOutputCoverage(GrInitInvariantOutput*) const SK_OVERRIDE;
+ void onGetInvariantOutputCoverage(GrInitInvariantOutput*) const SK_OVERRIDE;
GrTextureAccess fTextureAccess;
uint32_t fFlags;
@@ -190,7 +190,7 @@
virtual ~GrDistanceFieldLCDTextureEffect() {}
- virtual const char* name() const SK_OVERRIDE { return "DistanceFieldLCDTexture"; }
+ const char* name() const SK_OVERRIDE { return "DistanceFieldLCDTexture"; }
const GrAttribute* inPosition() const { return fInPosition; }
const GrAttribute* inTextureCoords() const { return fInTextureCoords; }
@@ -201,7 +201,7 @@
const GrGLCaps& caps,
GrProcessorKeyBuilder* b) const SK_OVERRIDE;
- virtual GrGLGeometryProcessor* createGLInstance(const GrBatchTracker& bt) const SK_OVERRIDE;
+ GrGLGeometryProcessor* createGLInstance(const GrBatchTracker& bt) const SK_OVERRIDE;
void initBatchTracker(GrBatchTracker* bt, const InitBT& init) const SK_OVERRIDE;
@@ -215,9 +215,9 @@
GrTexture* gamma, const GrTextureParams& gammaParams,
SkColor textColor, uint32_t flags);
- virtual bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE;
+ bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE;
- virtual void onGetInvariantOutputCoverage(GrInitInvariantOutput*) const SK_OVERRIDE;
+ void onGetInvariantOutputCoverage(GrInitInvariantOutput*) const SK_OVERRIDE;
GrTextureAccess fTextureAccess;
GrTextureAccess fGammaTextureAccess;
diff --git a/src/gpu/effects/GrDitherEffect.cpp b/src/gpu/effects/GrDitherEffect.cpp
index 799d970..5e73e3b 100644
--- a/src/gpu/effects/GrDitherEffect.cpp
+++ b/src/gpu/effects/GrDitherEffect.cpp
@@ -24,11 +24,11 @@
virtual ~DitherEffect() {};
- virtual const char* name() const SK_OVERRIDE { return "Dither"; }
+ const char* name() const SK_OVERRIDE { return "Dither"; }
- 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;
private:
DitherEffect() {
@@ -37,9 +37,9 @@
}
// All dither effects are equal
- virtual bool onIsEqual(const GrFragmentProcessor&) const SK_OVERRIDE { return true; }
+ bool onIsEqual(const GrFragmentProcessor&) const SK_OVERRIDE { return true; }
- virtual void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE;
+ void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE;
GR_DECLARE_FRAGMENT_PROCESSOR_TEST;
diff --git a/src/gpu/effects/GrMatrixConvolutionEffect.cpp b/src/gpu/effects/GrMatrixConvolutionEffect.cpp
index 6a71099..30f5b5e 100644
--- a/src/gpu/effects/GrMatrixConvolutionEffect.cpp
+++ b/src/gpu/effects/GrMatrixConvolutionEffect.cpp
@@ -22,7 +22,7 @@
static inline void GenKey(const GrProcessor&, const GrGLCaps&, GrProcessorKeyBuilder*);
- virtual void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE;
+ void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE;
private:
typedef GrGLProgramDataManager::UniformHandle UniformHandle;
diff --git a/src/gpu/effects/GrMatrixConvolutionEffect.h b/src/gpu/effects/GrMatrixConvolutionEffect.h
index 8d6bb7c..8f92175 100644
--- a/src/gpu/effects/GrMatrixConvolutionEffect.h
+++ b/src/gpu/effects/GrMatrixConvolutionEffect.h
@@ -60,11 +60,11 @@
bool convolveAlpha() const { return fConvolveAlpha; }
const GrTextureDomain& domain() const { return fDomain; }
- virtual const char* name() const SK_OVERRIDE { return "MatrixConvolution"; }
+ const char* name() const SK_OVERRIDE { return "MatrixConvolution"; }
- 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;
private:
GrMatrixConvolutionEffect(GrTexture*,
@@ -77,9 +77,9 @@
GrTextureDomain::Mode tileMode,
bool convolveAlpha);
- 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 {
// TODO: Try to do better?
inout->mulByUnknownFourComponents();
}
diff --git a/src/gpu/effects/GrOvalEffect.cpp b/src/gpu/effects/GrOvalEffect.cpp
index f1d1e68..314b000 100644
--- a/src/gpu/effects/GrOvalEffect.cpp
+++ b/src/gpu/effects/GrOvalEffect.cpp
@@ -22,11 +22,11 @@
virtual ~CircleEffect() {};
- virtual const char* name() const SK_OVERRIDE { return "Circle"; }
+ const char* name() const SK_OVERRIDE { return "Circle"; }
- 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;
const SkPoint& getCenter() const { return fCenter; }
SkScalar getRadius() const { return fRadius; }
@@ -36,9 +36,9 @@
private:
CircleEffect(GrPrimitiveEdgeType, const SkPoint& center, SkScalar radius);
- 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;
SkPoint fCenter;
SkScalar fRadius;
@@ -106,7 +106,7 @@
static inline void GenKey(const GrProcessor&, const GrGLCaps&, GrProcessorKeyBuilder*);
- virtual void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE;
+ void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE;
private:
GrGLProgramDataManager::UniformHandle fCircleUniform;
@@ -197,11 +197,11 @@
virtual ~EllipseEffect() {};
- virtual const char* name() const SK_OVERRIDE { return "Ellipse"; }
+ const char* name() const SK_OVERRIDE { return "Ellipse"; }
- 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;
const SkPoint& getCenter() const { return fCenter; }
SkVector getRadii() const { return fRadii; }
@@ -211,9 +211,9 @@
private:
EllipseEffect(GrPrimitiveEdgeType, const SkPoint& center, SkScalar rx, SkScalar ry);
- 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;
SkPoint fCenter;
SkVector fRadii;
@@ -284,7 +284,7 @@
static inline void GenKey(const GrProcessor&, const GrGLCaps&, GrProcessorKeyBuilder*);
- virtual void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE;
+ void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE;
private:
GrGLProgramDataManager::UniformHandle fEllipseUniform;
diff --git a/src/gpu/effects/GrPorterDuffXferProcessor.cpp b/src/gpu/effects/GrPorterDuffXferProcessor.cpp
index 2b10cad..aecf685 100644
--- a/src/gpu/effects/GrPorterDuffXferProcessor.cpp
+++ b/src/gpu/effects/GrPorterDuffXferProcessor.cpp
@@ -38,7 +38,7 @@
virtual ~GrGLPorterDuffXferProcessor() {}
- virtual void emitCode(const EmitArgs& args) SK_OVERRIDE {
+ void emitCode(const EmitArgs& args) SK_OVERRIDE {
const GrPorterDuffXferProcessor& xp = args.fXP.cast<GrPorterDuffXferProcessor>();
GrGLFPFragmentBuilder* fsBuilder = args.fPB->getFragmentShaderBuilder();
if (xp.hasSecondaryOutput()) {
@@ -86,7 +86,7 @@
}
}
- virtual void setData(const GrGLProgramDataManager&, const GrXferProcessor&) SK_OVERRIDE {};
+ void setData(const GrGLProgramDataManager&, const GrXferProcessor&) SK_OVERRIDE {};
static void GenKey(const GrProcessor& processor, const GrGLCaps& caps,
GrProcessorKeyBuilder* b) {
diff --git a/src/gpu/effects/GrRRectEffect.cpp b/src/gpu/effects/GrRRectEffect.cpp
index 1c1bd18..2cc0651 100644
--- a/src/gpu/effects/GrRRectEffect.cpp
+++ b/src/gpu/effects/GrRRectEffect.cpp
@@ -48,11 +48,11 @@
virtual ~CircularRRectEffect() {};
- virtual const char* name() const SK_OVERRIDE { return "CircularRRect"; }
+ const char* name() const SK_OVERRIDE { return "CircularRRect"; }
- 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;
const SkRRect& getRRect() const { return fRRect; }
@@ -63,9 +63,9 @@
private:
CircularRRectEffect(GrPrimitiveEdgeType, uint32_t circularCornerFlags, const SkRRect&);
- virtual bool onIsEqual(const GrFragmentProcessor& other) const SK_OVERRIDE;
+ bool onIsEqual(const GrFragmentProcessor& other) const SK_OVERRIDE;
- virtual void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE;
+ void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE;
SkRRect fRRect;
GrPrimitiveEdgeType fEdgeType;
@@ -141,7 +141,7 @@
static inline void GenKey(const GrProcessor&, const GrGLCaps&, GrProcessorKeyBuilder*);
- virtual void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE;
+ void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE;
private:
GrGLProgramDataManager::UniformHandle fInnerRectUniform;
@@ -392,11 +392,11 @@
virtual ~EllipticalRRectEffect() {};
- virtual const char* name() const SK_OVERRIDE { return "EllipticalRRect"; }
+ const char* name() const SK_OVERRIDE { return "EllipticalRRect"; }
- 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;
const SkRRect& getRRect() const { return fRRect; }
@@ -405,9 +405,9 @@
private:
EllipticalRRectEffect(GrPrimitiveEdgeType, const SkRRect&);
- virtual bool onIsEqual(const GrFragmentProcessor& other) const SK_OVERRIDE;
+ bool onIsEqual(const GrFragmentProcessor& other) const SK_OVERRIDE;
- virtual void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE;
+ void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE;
SkRRect fRRect;
GrPrimitiveEdgeType fEdgeType;
@@ -498,7 +498,7 @@
static inline void GenKey(const GrProcessor&, const GrGLCaps&, GrProcessorKeyBuilder*);
- virtual void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE;
+ void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE;
private:
GrGLProgramDataManager::UniformHandle fInnerRectUniform;
diff --git a/src/gpu/effects/GrSimpleTextureEffect.h b/src/gpu/effects/GrSimpleTextureEffect.h
index 4b9268d..8afc235 100644
--- a/src/gpu/effects/GrSimpleTextureEffect.h
+++ b/src/gpu/effects/GrSimpleTextureEffect.h
@@ -47,11 +47,11 @@
virtual ~GrSimpleTextureEffect() {}
- virtual const char* name() const SK_OVERRIDE { return "SimpleTexture"; }
+ const char* name() const SK_OVERRIDE { return "SimpleTexture"; }
- 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;
private:
GrSimpleTextureEffect(GrTexture* texture,
@@ -70,9 +70,9 @@
this->initClassID<GrSimpleTextureEffect>();
}
- virtual bool onIsEqual(const GrFragmentProcessor& other) const SK_OVERRIDE { return true; }
+ bool onIsEqual(const GrFragmentProcessor& other) const SK_OVERRIDE { return true; }
- virtual void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE;
+ void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE;
GR_DECLARE_FRAGMENT_PROCESSOR_TEST;
diff --git a/src/gpu/effects/GrTextureDomain.cpp b/src/gpu/effects/GrTextureDomain.cpp
index 3531106..9516595 100644
--- a/src/gpu/effects/GrTextureDomain.cpp
+++ b/src/gpu/effects/GrTextureDomain.cpp
@@ -176,7 +176,7 @@
const TransformedCoordsArray&,
const TextureSamplerArray&) SK_OVERRIDE;
- virtual void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE;
+ void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE;
static inline void GenKey(const GrProcessor&, const GrGLCaps&, GrProcessorKeyBuilder*);
diff --git a/src/gpu/effects/GrTextureDomain.h b/src/gpu/effects/GrTextureDomain.h
index 9e21c4a..3d8b569 100644
--- a/src/gpu/effects/GrTextureDomain.h
+++ b/src/gpu/effects/GrTextureDomain.h
@@ -153,11 +153,11 @@
virtual ~GrTextureDomainEffect();
- virtual const char* name() const SK_OVERRIDE { return "TextureDomain"; }
+ const char* name() const SK_OVERRIDE { return "TextureDomain"; }
- 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;
const GrTextureDomain& textureDomain() const { return fTextureDomain; }
@@ -172,9 +172,9 @@
GrTextureParams::FilterMode,
GrCoordSet);
- 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;
GR_DECLARE_FRAGMENT_PROCESSOR_TEST;
diff --git a/src/gpu/effects/GrYUVtoRGBEffect.cpp b/src/gpu/effects/GrYUVtoRGBEffect.cpp
index e8c7ff7..7361352 100644
--- a/src/gpu/effects/GrYUVtoRGBEffect.cpp
+++ b/src/gpu/effects/GrYUVtoRGBEffect.cpp
@@ -22,7 +22,7 @@
return SkNEW_ARGS(YUVtoRGBEffect, (yTexture, uTexture, vTexture, colorSpace));
}
- virtual const char* name() const SK_OVERRIDE { return "YUV to RGB"; }
+ const char* name() const SK_OVERRIDE { return "YUV to RGB"; }
SkYUVColorSpace getColorSpace() const {
return fColorSpace;
@@ -83,7 +83,7 @@
GLProcessor::GenKey(*this, caps, b);
}
- virtual GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE {
+ GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE {
return SkNEW_ARGS(GLProcessor, (*this));
}
@@ -104,12 +104,12 @@
this->addTextureAccess(&fVAccess);
}
- virtual bool onIsEqual(const GrFragmentProcessor& sBase) const SK_OVERRIDE {
+ bool onIsEqual(const GrFragmentProcessor& sBase) const SK_OVERRIDE {
const YUVtoRGBEffect& s = sBase.cast<YUVtoRGBEffect>();
return fColorSpace == s.getColorSpace();
}
- virtual void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE {
+ void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE {
// YUV is opaque
inout->setToOther(kA_GrColorComponentFlag, 0xFF << GrColor_SHIFT_A,
GrInvariantOutput::kWillNot_ReadInput);
diff --git a/src/gpu/gl/GrGLCaps.h b/src/gpu/gl/GrGLCaps.h
index 0018263..7ccb1d9 100644
--- a/src/gpu/gl/GrGLCaps.h
+++ b/src/gpu/gl/GrGLCaps.h
@@ -99,7 +99,7 @@
/**
* Resets the caps such that nothing is supported.
*/
- virtual void reset() SK_OVERRIDE;
+ void reset() SK_OVERRIDE;
/**
* Initializes the GrGLCaps to the set of features supported in the current
@@ -269,7 +269,7 @@
/**
* Returns a string containing the caps info.
*/
- virtual SkString dump() const SK_OVERRIDE;
+ SkString dump() const SK_OVERRIDE;
/**
* LATC can appear under one of three possible names. In order to know
diff --git a/src/gpu/gl/GrGLIndexBuffer.h b/src/gpu/gl/GrGLIndexBuffer.h
index 0eb10bb..3ff746e 100644
--- a/src/gpu/gl/GrGLIndexBuffer.h
+++ b/src/gpu/gl/GrGLIndexBuffer.h
@@ -31,13 +31,13 @@
}
protected:
- virtual void onAbandon() SK_OVERRIDE;
- virtual void onRelease() SK_OVERRIDE;
+ void onAbandon() SK_OVERRIDE;
+ void onRelease() SK_OVERRIDE;
private:
- virtual void* onMap() SK_OVERRIDE;
- virtual void onUnmap() SK_OVERRIDE;
- virtual bool onUpdateData(const void* src, size_t srcSizeInBytes) SK_OVERRIDE;
+ void* onMap() SK_OVERRIDE;
+ void onUnmap() SK_OVERRIDE;
+ bool onUpdateData(const void* src, size_t srcSizeInBytes) SK_OVERRIDE;
GrGLGpu* getGpuGL() const {
SkASSERT(!this->wasDestroyed());
diff --git a/src/gpu/gl/GrGLNameAllocator.cpp b/src/gpu/gl/GrGLNameAllocator.cpp
index f2c37ed..9d60162 100644
--- a/src/gpu/gl/GrGLNameAllocator.cpp
+++ b/src/gpu/gl/GrGLNameAllocator.cpp
@@ -133,7 +133,7 @@
this->updateStats();
}
- virtual SparseNameRange* SK_WARN_UNUSED_RESULT internalAllocate(GrGLuint* outName) SK_OVERRIDE {
+ SparseNameRange* SK_WARN_UNUSED_RESULT internalAllocate(GrGLuint* outName) SK_OVERRIDE {
// Try allocating the range inside fLeft's internal gaps.
fLeft.reset(fLeft->internalAllocate(outName));
if (0 != *outName) {
@@ -160,7 +160,7 @@
return this->takeRef();
}
- virtual SparseNameRange* SK_WARN_UNUSED_RESULT removeLeftmostContiguousRange(GrGLuint* removedCount) SK_OVERRIDE {
+ SparseNameRange* SK_WARN_UNUSED_RESULT removeLeftmostContiguousRange(GrGLuint* removedCount) SK_OVERRIDE {
fLeft.reset(fLeft->removeLeftmostContiguousRange(removedCount));
if (NULL == fLeft) {
return fRight.detach();
@@ -169,7 +169,7 @@
return this->rebalance();
}
- virtual GrGLuint appendNames(GrGLuint count) SK_OVERRIDE {
+ GrGLuint appendNames(GrGLuint count) SK_OVERRIDE {
SkASSERT(fEnd + count > fEnd); // Check for integer wrap.
GrGLuint name = fRight->appendNames(count);
SkASSERT(fRight->end() == fEnd + count);
@@ -177,7 +177,7 @@
return name;
}
- virtual GrGLuint prependNames(GrGLuint count) SK_OVERRIDE {
+ GrGLuint prependNames(GrGLuint count) SK_OVERRIDE {
SkASSERT(fFirst > count); // We can't allocate at or below 0.
GrGLuint name = fLeft->prependNames(count);
SkASSERT(fLeft->first() == fFirst - count);
@@ -185,7 +185,7 @@
return name;
}
- virtual SparseNameRange* SK_WARN_UNUSED_RESULT free(GrGLuint name) SK_OVERRIDE {
+ SparseNameRange* SK_WARN_UNUSED_RESULT free(GrGLuint name) SK_OVERRIDE {
if (name < fLeft->end()) {
fLeft.reset(fLeft->free(name));
if (NULL == fLeft) {
@@ -280,30 +280,30 @@
fHeight = 0;
}
- virtual SparseNameRange* SK_WARN_UNUSED_RESULT internalAllocate(GrGLuint* outName) SK_OVERRIDE {
+ SparseNameRange* SK_WARN_UNUSED_RESULT internalAllocate(GrGLuint* outName) SK_OVERRIDE {
*outName = 0; // No internal gaps, we are contiguous.
return this->takeRef();
}
- virtual SparseNameRange* SK_WARN_UNUSED_RESULT removeLeftmostContiguousRange(GrGLuint* removedCount) SK_OVERRIDE {
+ SparseNameRange* SK_WARN_UNUSED_RESULT removeLeftmostContiguousRange(GrGLuint* removedCount) SK_OVERRIDE {
*removedCount = fEnd - fFirst;
return NULL;
}
- virtual GrGLuint appendNames(GrGLuint count) SK_OVERRIDE {
+ GrGLuint appendNames(GrGLuint count) SK_OVERRIDE {
SkASSERT(fEnd + count > fEnd); // Check for integer wrap.
GrGLuint name = fEnd;
fEnd += count;
return name;
}
- virtual GrGLuint prependNames(GrGLuint count) SK_OVERRIDE {
+ GrGLuint prependNames(GrGLuint count) SK_OVERRIDE {
SkASSERT(fFirst > count); // We can't allocate at or below 0.
fFirst -= count;
return fFirst;
}
- virtual SparseNameRange* SK_WARN_UNUSED_RESULT free(GrGLuint name) SK_OVERRIDE {
+ SparseNameRange* SK_WARN_UNUSED_RESULT free(GrGLuint name) SK_OVERRIDE {
if (name < fFirst || name >= fEnd) {
// Not-allocated names are silently ignored.
return this->takeRef();
diff --git a/src/gpu/gl/GrGLPath.h b/src/gpu/gl/GrGLPath.h
index 57a2640..f048f85 100644
--- a/src/gpu/gl/GrGLPath.h
+++ b/src/gpu/gl/GrGLPath.h
@@ -31,12 +31,12 @@
GrGLuint pathID() const { return fPathID; }
protected:
- virtual void onRelease() SK_OVERRIDE;
- virtual void onAbandon() SK_OVERRIDE;
+ void onRelease() SK_OVERRIDE;
+ void onAbandon() SK_OVERRIDE;
private:
// TODO: Figure out how to get an approximate size of the path in Gpu memory.
- virtual size_t onGpuMemorySize() const SK_OVERRIDE { return 100; }
+ size_t onGpuMemorySize() const SK_OVERRIDE { return 100; }
GrGLuint fPathID;
diff --git a/src/gpu/gl/GrGLPathRange.h b/src/gpu/gl/GrGLPathRange.h
index 17d44c2..ce13a3a 100644
--- a/src/gpu/gl/GrGLPathRange.h
+++ b/src/gpu/gl/GrGLPathRange.h
@@ -42,13 +42,13 @@
GrGLuint basePathID() const { return fBasePathID; }
protected:
- virtual void onInitPath(int index, const SkPath&) const SK_OVERRIDE;
+ void onInitPath(int index, const SkPath&) const SK_OVERRIDE;
- virtual void onRelease() SK_OVERRIDE;
- virtual void onAbandon() SK_OVERRIDE;
+ void onRelease() SK_OVERRIDE;
+ void onAbandon() SK_OVERRIDE;
private:
- virtual size_t onGpuMemorySize() const SK_OVERRIDE { return fGpuMemorySize; }
+ size_t onGpuMemorySize() const SK_OVERRIDE { return fGpuMemorySize; }
GrGLuint fBasePathID;
mutable size_t fGpuMemorySize;
diff --git a/src/gpu/gl/GrGLPathRendering.h b/src/gpu/gl/GrGLPathRendering.h
index 0ebf470..ac56a92 100644
--- a/src/gpu/gl/GrGLPathRendering.h
+++ b/src/gpu/gl/GrGLPathRendering.h
@@ -33,14 +33,14 @@
virtual ~GrGLPathRendering();
// GrPathRendering implementations.
- virtual GrPath* createPath(const SkPath&, const SkStrokeRec&) SK_OVERRIDE;
+ GrPath* createPath(const SkPath&, const SkStrokeRec&) SK_OVERRIDE;
virtual GrPathRange* createPathRange(GrPathRange::PathGenerator*,
const SkStrokeRec&) SK_OVERRIDE;
virtual GrPathRange* createGlyphs(const SkTypeface*,
const SkDescriptor*,
const SkStrokeRec&) SK_OVERRIDE;
- virtual void stencilPath(const GrPath*, const GrStencilSettings&) SK_OVERRIDE;
- virtual void drawPath(const GrPath*, const GrStencilSettings&) SK_OVERRIDE;
+ void stencilPath(const GrPath*, const GrStencilSettings&) SK_OVERRIDE;
+ void drawPath(const GrPath*, const GrStencilSettings&) SK_OVERRIDE;
virtual void drawPaths(const GrPathRange*, const void* indices, PathIndexType,
const float transformValues[], PathTransformType, int count,
const GrStencilSettings&) SK_OVERRIDE;
diff --git a/src/gpu/gl/GrGLProgram.h b/src/gpu/gl/GrGLProgram.h
index 6e7e22b..e70fee7 100644
--- a/src/gpu/gl/GrGLProgram.h
+++ b/src/gpu/gl/GrGLProgram.h
@@ -183,7 +183,7 @@
class GrGLNvprProgram : public GrGLNvprProgramBase {
public:
- virtual bool hasVertexShader() const SK_OVERRIDE { return true; }
+ bool hasVertexShader() const SK_OVERRIDE { return true; }
private:
typedef GrGLNvprProgramBuilder::SeparableVaryingInfo SeparableVaryingInfo;
@@ -197,7 +197,7 @@
GrGLInstalledXferProc* xferProcessor,
GrGLInstalledFragProcs* fragmentProcessors,
const SeparableVaryingInfoArray& separableVaryings);
- virtual void didSetData(GrGpu::DrawType) SK_OVERRIDE;
+ void didSetData(GrGpu::DrawType) SK_OVERRIDE;
virtual void setTransformData(const GrPendingFragmentStage&,
const SkMatrix& localMatrix,
GrGLInstalledFragProc*) SK_OVERRIDE;
@@ -217,7 +217,7 @@
class GrGLLegacyNvprProgram : public GrGLNvprProgramBase {
public:
- virtual bool hasVertexShader() const SK_OVERRIDE { return false; }
+ bool hasVertexShader() const SK_OVERRIDE { return false; }
private:
GrGLLegacyNvprProgram(GrGLGpu* gpu,
@@ -229,7 +229,7 @@
GrGLInstalledXferProc* xp,
GrGLInstalledFragProcs* fps,
int texCoordSetCnt);
- virtual void didSetData(GrGpu::DrawType) SK_OVERRIDE;
+ void didSetData(GrGpu::DrawType) SK_OVERRIDE;
virtual void setTransformData(const GrPendingFragmentStage&,
const SkMatrix& localMatrix,
GrGLInstalledFragProc*) SK_OVERRIDE;
diff --git a/src/gpu/gl/GrGLRenderTarget.h b/src/gpu/gl/GrGLRenderTarget.h
index adc967f..09de571 100644
--- a/src/gpu/gl/GrGLRenderTarget.h
+++ b/src/gpu/gl/GrGLRenderTarget.h
@@ -42,9 +42,9 @@
GrGLuint textureFBOID() const { return fTexFBOID; }
// override of GrRenderTarget
- virtual GrBackendObject getRenderTargetHandle() const SK_OVERRIDE { return this->renderFBOID(); }
- virtual GrBackendObject getRenderTargetResolvedHandle() const SK_OVERRIDE { return this->textureFBOID(); }
- virtual ResolveType getResolveType() const SK_OVERRIDE {
+ GrBackendObject getRenderTargetHandle() const SK_OVERRIDE { return this->renderFBOID(); }
+ GrBackendObject getRenderTargetResolvedHandle() const SK_OVERRIDE { return this->textureFBOID(); }
+ ResolveType getResolveType() const SK_OVERRIDE {
if (!this->isMultisampled() ||
fRTFBOID == fTexFBOID) {
// catches FBO 0 and non MSAA case
@@ -65,11 +65,11 @@
void init(const GrSurfaceDesc&, const IDDesc&);
- virtual void onAbandon() SK_OVERRIDE;
- virtual void onRelease() SK_OVERRIDE;
+ void onAbandon() SK_OVERRIDE;
+ void onRelease() SK_OVERRIDE;
// In protected because subclass GrGLTextureRenderTarget calls this version.
- virtual size_t onGpuMemorySize() const SK_OVERRIDE;
+ size_t onGpuMemorySize() const SK_OVERRIDE;
private:
GrGLuint fRTFBOID;
diff --git a/src/gpu/gl/GrGLStencilBuffer.h b/src/gpu/gl/GrGLStencilBuffer.h
index ff0d5cb..c554091 100644
--- a/src/gpu/gl/GrGLStencilBuffer.h
+++ b/src/gpu/gl/GrGLStencilBuffer.h
@@ -43,11 +43,11 @@
protected:
// overrides of GrResource
- virtual void onRelease() SK_OVERRIDE;
- virtual void onAbandon() SK_OVERRIDE;
+ void onRelease() SK_OVERRIDE;
+ void onAbandon() SK_OVERRIDE;
private:
- virtual size_t onGpuMemorySize() const SK_OVERRIDE;
+ size_t onGpuMemorySize() const SK_OVERRIDE;
Format fFormat;
// may be zero for external SBs associated with external RTs
diff --git a/src/gpu/gl/GrGLTexture.h b/src/gpu/gl/GrGLTexture.h
index 7c64e17..cc8adeb 100644
--- a/src/gpu/gl/GrGLTexture.h
+++ b/src/gpu/gl/GrGLTexture.h
@@ -33,9 +33,9 @@
GrGLTexture(GrGLGpu*, const GrSurfaceDesc&, const IDDesc&);
- virtual GrBackendObject getTextureHandle() const SK_OVERRIDE;
+ GrBackendObject getTextureHandle() const SK_OVERRIDE;
- virtual void textureParamsModified() SK_OVERRIDE { fTexParams.invalidate(); }
+ void textureParamsModified() SK_OVERRIDE { fTexParams.invalidate(); }
// These functions are used to track the texture parameters associated with the texture.
const TexParams& getCachedTexParams(GrGpu::ResetTimestamp* timestamp) const {
@@ -60,8 +60,8 @@
void init(const GrSurfaceDesc&, const IDDesc&);
- virtual void onAbandon() SK_OVERRIDE;
- virtual void onRelease() SK_OVERRIDE;
+ void onAbandon() SK_OVERRIDE;
+ void onRelease() SK_OVERRIDE;
private:
TexParams fTexParams;
diff --git a/src/gpu/gl/GrGLTextureRenderTarget.h b/src/gpu/gl/GrGLTextureRenderTarget.h
index 69f70c4..af0fde4 100644
--- a/src/gpu/gl/GrGLTextureRenderTarget.h
+++ b/src/gpu/gl/GrGLTextureRenderTarget.h
@@ -35,19 +35,19 @@
}
protected:
- virtual void onAbandon() SK_OVERRIDE {
+ void onAbandon() SK_OVERRIDE {
GrGLRenderTarget::onAbandon();
GrGLTexture::onAbandon();
}
- virtual void onRelease() SK_OVERRIDE {
+ void onRelease() SK_OVERRIDE {
GrGLRenderTarget::onRelease();
GrGLTexture::onRelease();
}
private:
// GrGLRenderTarget accounts for the texture's memory and any MSAA renderbuffer's memory.
- virtual size_t onGpuMemorySize() const SK_OVERRIDE {
+ size_t onGpuMemorySize() const SK_OVERRIDE {
return GrGLRenderTarget::onGpuMemorySize();
}
diff --git a/src/gpu/gl/GrGLVertexArray.h b/src/gpu/gl/GrGLVertexArray.h
index 792fd94..f795ed8 100644
--- a/src/gpu/gl/GrGLVertexArray.h
+++ b/src/gpu/gl/GrGLVertexArray.h
@@ -160,11 +160,11 @@
void invalidateCachedState();
protected:
- virtual size_t onGpuMemorySize() const SK_OVERRIDE { return 0; }
+ size_t onGpuMemorySize() const SK_OVERRIDE { return 0; }
- virtual void onAbandon() SK_OVERRIDE;
+ void onAbandon() SK_OVERRIDE;
- virtual void onRelease() SK_OVERRIDE;
+ void onRelease() SK_OVERRIDE;
private:
GrGLuint fID;
diff --git a/src/gpu/gl/GrGLVertexBuffer.h b/src/gpu/gl/GrGLVertexBuffer.h
index ea2e37d..c428f4d 100644
--- a/src/gpu/gl/GrGLVertexBuffer.h
+++ b/src/gpu/gl/GrGLVertexBuffer.h
@@ -31,13 +31,13 @@
}
protected:
- virtual void onAbandon() SK_OVERRIDE;
- virtual void onRelease() SK_OVERRIDE;
+ void onAbandon() SK_OVERRIDE;
+ void onRelease() SK_OVERRIDE;
private:
- virtual void* onMap() SK_OVERRIDE;
- virtual void onUnmap() SK_OVERRIDE;
- virtual bool onUpdateData(const void* src, size_t srcSizeInBytes) SK_OVERRIDE;
+ void* onMap() SK_OVERRIDE;
+ void onUnmap() SK_OVERRIDE;
+ bool onUpdateData(const void* src, size_t srcSizeInBytes) SK_OVERRIDE;
GrGLGpu* getGpuGL() const {
SkASSERT(!this->wasDestroyed());
diff --git a/src/gpu/gl/SkNullGLContext.h b/src/gpu/gl/SkNullGLContext.h
index 92ac11a..b0432ba 100644
--- a/src/gpu/gl/SkNullGLContext.h
+++ b/src/gpu/gl/SkNullGLContext.h
@@ -12,9 +12,9 @@
class SK_API SkNullGLContext : public SkGLContext {
public:
- virtual ~SkNullGLContext() SK_OVERRIDE;
- virtual void makeCurrent() const SK_OVERRIDE {};
- virtual void swapBuffers() const SK_OVERRIDE {};
+ ~SkNullGLContext() SK_OVERRIDE;
+ void makeCurrent() const SK_OVERRIDE {};
+ void swapBuffers() const SK_OVERRIDE {};
static SkNullGLContext* Create(GrGLStandard forcedGpuAPI) {
if (kGLES_GrGLStandard == forcedGpuAPI) {
diff --git a/src/gpu/gl/angle/SkANGLEGLContext.h b/src/gpu/gl/angle/SkANGLEGLContext.h
index dec3f9f..604de42 100644
--- a/src/gpu/gl/angle/SkANGLEGLContext.h
+++ b/src/gpu/gl/angle/SkANGLEGLContext.h
@@ -17,9 +17,9 @@
class SkANGLEGLContext : public SkGLContext {
public:
- virtual ~SkANGLEGLContext() SK_OVERRIDE;
- virtual void makeCurrent() const SK_OVERRIDE;
- virtual void swapBuffers() const SK_OVERRIDE;
+ ~SkANGLEGLContext() SK_OVERRIDE;
+ void makeCurrent() const SK_OVERRIDE;
+ void swapBuffers() const SK_OVERRIDE;
static SkANGLEGLContext* Create(GrGLStandard forcedGpuAPI) {
if (kGL_GrGLStandard == forcedGpuAPI) {
diff --git a/src/gpu/gl/builders/GrGLFragmentShaderBuilder.h b/src/gpu/gl/builders/GrGLFragmentShaderBuilder.h
index 456ec4f..8e8a008 100644
--- a/src/gpu/gl/builders/GrGLFragmentShaderBuilder.h
+++ b/src/gpu/gl/builders/GrGLFragmentShaderBuilder.h
@@ -87,11 +87,11 @@
GrGLFragmentShaderBuilder(GrGLProgramBuilder* program, uint8_t fragPosKey);
// true public interface, defined explicitly in the abstract interfaces above
- virtual bool enableFeature(GLSLFeature) SK_OVERRIDE;
+ bool enableFeature(GLSLFeature) SK_OVERRIDE;
virtual SkString ensureFSCoords2D(const GrGLProcessor::TransformedCoordsArray& coords,
int index) SK_OVERRIDE;
- virtual const char* fragmentPosition() SK_OVERRIDE;
- virtual const char* dstColor() SK_OVERRIDE;
+ const char* fragmentPosition() SK_OVERRIDE;
+ const char* dstColor() SK_OVERRIDE;
private:
// Private public interface, used by GrGLProgramBuilder to build a fragment shader
diff --git a/src/gpu/gl/builders/GrGLLegacyNvprProgramBuilder.h b/src/gpu/gl/builders/GrGLLegacyNvprProgramBuilder.h
index f34f6cc..519e87a 100644
--- a/src/gpu/gl/builders/GrGLLegacyNvprProgramBuilder.h
+++ b/src/gpu/gl/builders/GrGLLegacyNvprProgramBuilder.h
@@ -14,7 +14,7 @@
public:
GrGLLegacyNvprProgramBuilder(GrGLGpu*, const GrOptDrawState&);
- virtual GrGLProgram* createProgram(GrGLuint programID) SK_OVERRIDE;
+ GrGLProgram* createProgram(GrGLuint programID) SK_OVERRIDE;
private:
int addTexCoordSets(int count);
diff --git a/src/gpu/gl/builders/GrGLNvprProgramBuilder.h b/src/gpu/gl/builders/GrGLNvprProgramBuilder.h
index cfb07fd..83a3558 100644
--- a/src/gpu/gl/builders/GrGLNvprProgramBuilder.h
+++ b/src/gpu/gl/builders/GrGLNvprProgramBuilder.h
@@ -25,7 +25,7 @@
typedef GrTAllocator<SeparableVaryingInfo> SeparableVaryingInfoArray;
- virtual GrGLProgram* createProgram(GrGLuint programID) SK_OVERRIDE;
+ GrGLProgram* createProgram(GrGLuint programID) SK_OVERRIDE;
private:
virtual void emitTransforms(const GrPendingFragmentStage&,
diff --git a/src/gpu/gl/debug/GrBufferObj.h b/src/gpu/gl/debug/GrBufferObj.h
index 5c282ee..d0bb83d 100644
--- a/src/gpu/gl/debug/GrBufferObj.h
+++ b/src/gpu/gl/debug/GrBufferObj.h
@@ -55,7 +55,7 @@
void setUsage(GrGLint usage) { fUsage = usage; }
GrGLint getUsage() const { return fUsage; }
- virtual void deleteAction() SK_OVERRIDE;
+ void deleteAction() SK_OVERRIDE;
protected:
private:
diff --git a/src/gpu/gl/debug/GrFrameBufferObj.h b/src/gpu/gl/debug/GrFrameBufferObj.h
index 33af4f7..3cfa236 100644
--- a/src/gpu/gl/debug/GrFrameBufferObj.h
+++ b/src/gpu/gl/debug/GrFrameBufferObj.h
@@ -46,7 +46,7 @@
void setStencil(GrFBBindableObj *buffer);
GrFBBindableObj *getStencil() { return fStencilBuffer; }
- virtual void deleteAction() SK_OVERRIDE {
+ void deleteAction() SK_OVERRIDE {
setColor(NULL);
setDepth(NULL);
diff --git a/src/gpu/gl/debug/GrGLCreateDebugInterface.cpp b/src/gpu/gl/debug/GrGLCreateDebugInterface.cpp
index f6b4974..77a1422 100644
--- a/src/gpu/gl/debug/GrGLCreateDebugInterface.cpp
+++ b/src/gpu/gl/debug/GrGLCreateDebugInterface.cpp
@@ -796,7 +796,7 @@
fWrapped.reset(interface);
}
- virtual void abandon() const SK_OVERRIDE {
+ void abandon() const SK_OVERRIDE {
GrDebugGL::abandon();
}
diff --git a/src/gpu/gl/debug/GrProgramObj.h b/src/gpu/gl/debug/GrProgramObj.h
index eebcc88..d06e410 100644
--- a/src/gpu/gl/debug/GrProgramObj.h
+++ b/src/gpu/gl/debug/GrProgramObj.h
@@ -24,7 +24,7 @@
void AttachShader(GrShaderObj *shader);
- virtual void deleteAction() SK_OVERRIDE;
+ void deleteAction() SK_OVERRIDE;
// TODO: this flag system won't work w/ multiple contexts!
void setInUse() { fInUse = true; }
diff --git a/src/gpu/gl/debug/GrRenderBufferObj.h b/src/gpu/gl/debug/GrRenderBufferObj.h
index 344b90e..2ad3e2c 100644
--- a/src/gpu/gl/debug/GrRenderBufferObj.h
+++ b/src/gpu/gl/debug/GrRenderBufferObj.h
@@ -25,7 +25,7 @@
void resetBound() { fBound = false; }
bool getBound() const { return fBound; }
- virtual void deleteAction() SK_OVERRIDE {
+ void deleteAction() SK_OVERRIDE {
this->INHERITED::deleteAction();
}
diff --git a/src/gpu/gl/debug/GrShaderObj.h b/src/gpu/gl/debug/GrShaderObj.h
index 0b888fa..c59d9c9 100644
--- a/src/gpu/gl/debug/GrShaderObj.h
+++ b/src/gpu/gl/debug/GrShaderObj.h
@@ -24,7 +24,7 @@
void setType(GrGLenum type) { fType = type; }
GrGLenum getType() { return fType; }
- virtual void deleteAction() SK_OVERRIDE;
+ void deleteAction() SK_OVERRIDE;
protected:
private:
diff --git a/src/gpu/gl/debug/GrTextureObj.h b/src/gpu/gl/debug/GrTextureObj.h
index 7673cd1..653e23f 100644
--- a/src/gpu/gl/debug/GrTextureObj.h
+++ b/src/gpu/gl/debug/GrTextureObj.h
@@ -43,7 +43,7 @@
return 0 != fTextureUnitReferees.count();
}
- virtual void deleteAction() SK_OVERRIDE;
+ void deleteAction() SK_OVERRIDE;
protected:
diff --git a/src/gpu/gl/debug/SkDebugGLContext.h b/src/gpu/gl/debug/SkDebugGLContext.h
index 7dca67f..35e4456 100644
--- a/src/gpu/gl/debug/SkDebugGLContext.h
+++ b/src/gpu/gl/debug/SkDebugGLContext.h
@@ -12,9 +12,9 @@
class SkDebugGLContext : public SkGLContext {
public:
- virtual ~SkDebugGLContext() SK_OVERRIDE;
- virtual void makeCurrent() const SK_OVERRIDE {}
- virtual void swapBuffers() const SK_OVERRIDE {}
+ ~SkDebugGLContext() SK_OVERRIDE;
+ void makeCurrent() const SK_OVERRIDE {}
+ void swapBuffers() const SK_OVERRIDE {}
static SkDebugGLContext* Create(GrGLStandard forcedGpuAPI) {
if (kGLES_GrGLStandard == forcedGpuAPI) {
diff --git a/src/gpu/gl/egl/SkCreatePlatformGLContext_egl.cpp b/src/gpu/gl/egl/SkCreatePlatformGLContext_egl.cpp
index 1974197..9f35981 100644
--- a/src/gpu/gl/egl/SkCreatePlatformGLContext_egl.cpp
+++ b/src/gpu/gl/egl/SkCreatePlatformGLContext_egl.cpp
@@ -15,9 +15,9 @@
class EGLGLContext : public SkGLContext {
public:
EGLGLContext(GrGLStandard forcedGpuAPI);
- virtual ~EGLGLContext() SK_OVERRIDE;
- virtual void makeCurrent() const SK_OVERRIDE;
- virtual void swapBuffers() const SK_OVERRIDE;
+ ~EGLGLContext() SK_OVERRIDE;
+ void makeCurrent() const SK_OVERRIDE;
+ void swapBuffers() const SK_OVERRIDE;
private:
void destroyGLContext();
diff --git a/src/gpu/gl/glx/SkCreatePlatformGLContext_glx.cpp b/src/gpu/gl/glx/SkCreatePlatformGLContext_glx.cpp
index f9977b2..9efa993 100644
--- a/src/gpu/gl/glx/SkCreatePlatformGLContext_glx.cpp
+++ b/src/gpu/gl/glx/SkCreatePlatformGLContext_glx.cpp
@@ -47,9 +47,9 @@
class GLXGLContext : public SkGLContext {
public:
GLXGLContext(GrGLStandard forcedGpuAPI);
- virtual ~GLXGLContext() SK_OVERRIDE;
- virtual void makeCurrent() const SK_OVERRIDE;
- virtual void swapBuffers() const SK_OVERRIDE;
+ ~GLXGLContext() SK_OVERRIDE;
+ void makeCurrent() const SK_OVERRIDE;
+ void swapBuffers() const SK_OVERRIDE;
private:
void destroyGLContext();
diff --git a/src/gpu/gl/iOS/SkCreatePlatformGLContext_iOS.mm b/src/gpu/gl/iOS/SkCreatePlatformGLContext_iOS.mm
index 423ef8c..f900976 100644
--- a/src/gpu/gl/iOS/SkCreatePlatformGLContext_iOS.mm
+++ b/src/gpu/gl/iOS/SkCreatePlatformGLContext_iOS.mm
@@ -16,9 +16,9 @@
class IOSGLContext : public SkGLContext {
public:
IOSGLContext();
- virtual ~IOSGLContext() SK_OVERRIDE;
- virtual void makeCurrent() const SK_OVERRIDE;
- virtual void swapBuffers() const SK_OVERRIDE;
+ ~IOSGLContext() SK_OVERRIDE;
+ void makeCurrent() const SK_OVERRIDE;
+ void swapBuffers() const SK_OVERRIDE;
private:
void destroyGLContext();
diff --git a/src/gpu/gl/mac/SkCreatePlatformGLContext_mac.cpp b/src/gpu/gl/mac/SkCreatePlatformGLContext_mac.cpp
index 5ae1aeb..e7f21e0 100644
--- a/src/gpu/gl/mac/SkCreatePlatformGLContext_mac.cpp
+++ b/src/gpu/gl/mac/SkCreatePlatformGLContext_mac.cpp
@@ -14,9 +14,9 @@
class MacGLContext : public SkGLContext {
public:
MacGLContext();
- virtual ~MacGLContext() SK_OVERRIDE;
- virtual void makeCurrent() const SK_OVERRIDE;
- virtual void swapBuffers() const SK_OVERRIDE;
+ ~MacGLContext() SK_OVERRIDE;
+ void makeCurrent() const SK_OVERRIDE;
+ void swapBuffers() const SK_OVERRIDE;
private:
void destroyGLContext();
diff --git a/src/gpu/gl/mesa/SkMesaGLContext.h b/src/gpu/gl/mesa/SkMesaGLContext.h
index 0fc5162..df7e0b0 100644
--- a/src/gpu/gl/mesa/SkMesaGLContext.h
+++ b/src/gpu/gl/mesa/SkMesaGLContext.h
@@ -17,9 +17,9 @@
typedef intptr_t Context;
public:
- virtual ~SkMesaGLContext() SK_OVERRIDE;
- virtual void makeCurrent() const SK_OVERRIDE;
- virtual void swapBuffers() const SK_OVERRIDE;
+ ~SkMesaGLContext() SK_OVERRIDE;
+ void makeCurrent() const SK_OVERRIDE;
+ void swapBuffers() const SK_OVERRIDE;
static SkMesaGLContext* Create(GrGLStandard forcedGpuAPI) {
if (kGLES_GrGLStandard == forcedGpuAPI) {
diff --git a/src/gpu/gl/win/SkCreatePlatformGLContext_win.cpp b/src/gpu/gl/win/SkCreatePlatformGLContext_win.cpp
index 890c784..5f3d364 100644
--- a/src/gpu/gl/win/SkCreatePlatformGLContext_win.cpp
+++ b/src/gpu/gl/win/SkCreatePlatformGLContext_win.cpp
@@ -20,9 +20,9 @@
class WinGLContext : public SkGLContext {
public:
WinGLContext(GrGLStandard forcedGpuAPI);
- virtual ~WinGLContext() SK_OVERRIDE;
- virtual void makeCurrent() const SK_OVERRIDE;
- virtual void swapBuffers() const SK_OVERRIDE;
+ ~WinGLContext() SK_OVERRIDE;
+ void makeCurrent() const SK_OVERRIDE;
+ void swapBuffers() const SK_OVERRIDE;
private:
void destroyGLContext();