diff options
Diffstat (limited to 'src/core')
39 files changed, 270 insertions, 270 deletions
diff --git a/src/core/SkAAClip.cpp b/src/core/SkAAClip.cpp index e2c1b12d07..45e6cc3ae6 100644 --- a/src/core/SkAAClip.cpp +++ b/src/core/SkAAClip.cpp @@ -1273,13 +1273,13 @@ public: Instead we'll rely on the runtime asserts to guarantee Y monotonicity; any failure cases that misses may have minor artifacts. */ - virtual void blitV(int x, int y, int height, SkAlpha alpha) SK_OVERRIDE { + void blitV(int x, int y, int height, SkAlpha alpha) SK_OVERRIDE { this->recordMinY(y); fBuilder->addColumn(x, y, alpha, height); fLastY = y + height - 1; } - virtual void blitRect(int x, int y, int width, int height) SK_OVERRIDE { + void blitRect(int x, int y, int width, int height) SK_OVERRIDE { this->recordMinY(y); this->checkForYGap(y); fBuilder->addRectRun(x, y, width, height); @@ -1294,14 +1294,14 @@ public: fLastY = y + height - 1; } - virtual void blitMask(const SkMask&, const SkIRect& clip) SK_OVERRIDE + void blitMask(const SkMask&, const SkIRect& clip) SK_OVERRIDE { unexpected(); } - virtual const SkBitmap* justAnOpaqueColor(uint32_t*) SK_OVERRIDE { + const SkBitmap* justAnOpaqueColor(uint32_t*) SK_OVERRIDE { return NULL; } - virtual void blitH(int x, int y, int width) SK_OVERRIDE { + void blitH(int x, int y, int width) SK_OVERRIDE { this->recordMinY(y); this->checkForYGap(y); fBuilder->addRun(x, y, 0xFF, width); diff --git a/src/core/SkAAClip.h b/src/core/SkAAClip.h index 45cc54932d..67f45e4946 100644 --- a/src/core/SkAAClip.h +++ b/src/core/SkAAClip.h @@ -109,13 +109,13 @@ public: fAAClipBounds = aaclip->getBounds(); } - virtual void blitH(int x, int y, int width) SK_OVERRIDE; + void blitH(int x, int y, int width) SK_OVERRIDE; virtual void blitAntiH(int x, int y, const SkAlpha[], const int16_t runs[]) SK_OVERRIDE; - virtual void blitV(int x, int y, int height, SkAlpha alpha) SK_OVERRIDE; - virtual void blitRect(int x, int y, int width, int height) SK_OVERRIDE; - virtual void blitMask(const SkMask&, const SkIRect& clip) SK_OVERRIDE; - virtual const SkBitmap* justAnOpaqueColor(uint32_t* value) SK_OVERRIDE; + void blitV(int x, int y, int height, SkAlpha alpha) SK_OVERRIDE; + void blitRect(int x, int y, int width, int height) SK_OVERRIDE; + void blitMask(const SkMask&, const SkIRect& clip) SK_OVERRIDE; + const SkBitmap* justAnOpaqueColor(uint32_t* value) SK_OVERRIDE; private: SkBlitter* fBlitter; diff --git a/src/core/SkBitmapCache.cpp b/src/core/SkBitmapCache.cpp index 193a5ae536..3af582232b 100644 --- a/src/core/SkBitmapCache.cpp +++ b/src/core/SkBitmapCache.cpp @@ -61,8 +61,8 @@ struct BitmapRec : public SkResourceCache::Rec { BitmapKey fKey; SkBitmap fBitmap; - virtual const Key& getKey() const SK_OVERRIDE { return fKey; } - virtual size_t bytesUsed() const SK_OVERRIDE { return sizeof(fKey) + fBitmap.getSize(); } + const Key& getKey() const SK_OVERRIDE { return fKey; } + size_t bytesUsed() const SK_OVERRIDE { return sizeof(fKey) + fBitmap.getSize(); } static bool Visitor(const SkResourceCache::Rec& baseRec, void* contextBitmap) { const BitmapRec& rec = static_cast<const BitmapRec&>(baseRec); @@ -139,8 +139,8 @@ struct MipMapRec : public SkResourceCache::Rec { fMipMap->detachFromCacheAndUnref(); } - virtual const Key& getKey() const SK_OVERRIDE { return fKey; } - virtual size_t bytesUsed() const SK_OVERRIDE { return sizeof(fKey) + fMipMap->size(); } + const Key& getKey() const SK_OVERRIDE { return fKey; } + size_t bytesUsed() const SK_OVERRIDE { return sizeof(fKey) + fMipMap->size(); } static bool Visitor(const SkResourceCache::Rec& baseRec, void* contextMip) { const MipMapRec& rec = static_cast<const MipMapRec&>(baseRec); diff --git a/src/core/SkBitmapFilter.h b/src/core/SkBitmapFilter.h index 8ef0f6e1de..139e990a10 100644 --- a/src/core/SkBitmapFilter.h +++ b/src/core/SkBitmapFilter.h @@ -79,7 +79,7 @@ class SkMitchellFilter: public SkBitmapFilter { : SkBitmapFilter(width), B(b), C(c) { } - virtual float evaluate(float x) const SK_OVERRIDE { + float evaluate(float x) const SK_OVERRIDE { x = fabsf(x); if (x > 2.f) { return 0; @@ -102,7 +102,7 @@ class SkGaussianFilter: public SkBitmapFilter { : SkBitmapFilter(width), alpha(a), expWidth(expf(-alpha * width * width)) { } - virtual float evaluate(float x) const SK_OVERRIDE { + float evaluate(float x) const SK_OVERRIDE { return SkTMax(0.f, float(expf(-alpha*x*x) - expWidth)); } protected: @@ -115,7 +115,7 @@ class SkTriangleFilter: public SkBitmapFilter { : SkBitmapFilter(width) { } - virtual float evaluate(float x) const SK_OVERRIDE { + float evaluate(float x) const SK_OVERRIDE { return SkTMax(0.f, fWidth - fabsf(x)); } protected: @@ -127,7 +127,7 @@ class SkBoxFilter: public SkBitmapFilter { : SkBitmapFilter(width) { } - virtual float evaluate(float x) const SK_OVERRIDE { + float evaluate(float x) const SK_OVERRIDE { return (x >= -fWidth && x < fWidth) ? 1.0f : 0.0f; } protected: @@ -138,7 +138,7 @@ public: SkHammingFilter(float width=1.f) : SkBitmapFilter(width) { } - virtual float evaluate(float x) const SK_OVERRIDE { + float evaluate(float x) const SK_OVERRIDE { if (x <= -fWidth || x >= fWidth) { return 0.0f; // Outside of the window. } @@ -158,7 +158,7 @@ class SkLanczosFilter: public SkBitmapFilter { : SkBitmapFilter(width) { } - virtual float evaluate(float x) const SK_OVERRIDE { + float evaluate(float x) const SK_OVERRIDE { if (x <= -fWidth || x >= fWidth) { return 0.0f; // Outside of the window. } diff --git a/src/core/SkBitmapHeap.h b/src/core/SkBitmapHeap.h index 148ae132a4..95e272418a 100644 --- a/src/core/SkBitmapHeap.h +++ b/src/core/SkBitmapHeap.h @@ -117,7 +117,7 @@ public: * * @return The bitmap located at that slot or NULL if external storage is being used. */ - virtual SkBitmap* getBitmap(int32_t slot) const SK_OVERRIDE { + SkBitmap* getBitmap(int32_t slot) const SK_OVERRIDE { SkASSERT(fExternalStorage == NULL); SkBitmapHeapEntry* entry = getEntry(slot); if (entry) { @@ -131,7 +131,7 @@ public: * * @return The bitmap located at that slot or NULL if external storage is being used. */ - virtual void releaseRef(int32_t slot) SK_OVERRIDE { + void releaseRef(int32_t slot) SK_OVERRIDE { SkASSERT(fExternalStorage == NULL); if (fOwnerCount != IGNORE_OWNERS) { SkBitmapHeapEntry* entry = getEntry(slot); diff --git a/src/core/SkBitmapProcShader.h b/src/core/SkBitmapProcShader.h index ab00c11e39..f73d56f2fb 100644 --- a/src/core/SkBitmapProcShader.h +++ b/src/core/SkBitmapProcShader.h @@ -20,10 +20,10 @@ public: const SkMatrix* localMatrix = NULL); // overrides from SkShader - virtual bool isOpaque() const SK_OVERRIDE; - virtual BitmapType asABitmap(SkBitmap*, SkMatrix*, TileMode*) const SK_OVERRIDE; + bool isOpaque() const SK_OVERRIDE; + BitmapType asABitmap(SkBitmap*, SkMatrix*, TileMode*) const SK_OVERRIDE; - virtual size_t contextSize() const SK_OVERRIDE; + size_t contextSize() const SK_OVERRIDE; static bool CanDo(const SkBitmap&, TileMode tx, TileMode ty); @@ -41,11 +41,11 @@ public: BitmapProcShaderContext(const SkBitmapProcShader&, const ContextRec&, SkBitmapProcState*); virtual ~BitmapProcShaderContext(); - virtual void shadeSpan(int x, int y, SkPMColor dstC[], int count) SK_OVERRIDE; - virtual ShadeProc asAShadeProc(void** ctx) 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; + ShadeProc asAShadeProc(void** ctx) SK_OVERRIDE; + void shadeSpan16(int x, int y, uint16_t dstC[], int count) SK_OVERRIDE; - virtual uint32_t getFlags() const SK_OVERRIDE { return fFlags; } + uint32_t getFlags() const SK_OVERRIDE { return fFlags; } private: SkBitmapProcState* fState; @@ -55,8 +55,8 @@ public: }; protected: - virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; - virtual Context* onCreateContext(const ContextRec&, void* storage) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const SK_OVERRIDE; + Context* onCreateContext(const ContextRec&, void* storage) const SK_OVERRIDE; SkBitmap fRawBitmap; // experimental for RLE encoding uint8_t fTileModeX, fTileModeY; diff --git a/src/core/SkBlitter.cpp b/src/core/SkBlitter.cpp index 5bb7ac8d01..a5d2b0598b 100644 --- a/src/core/SkBlitter.cpp +++ b/src/core/SkBlitter.cpp @@ -580,7 +580,7 @@ public: SkSafeUnref(fProxy); } - virtual size_t contextSize() const SK_OVERRIDE { + size_t contextSize() const SK_OVERRIDE { size_t size = sizeof(Sk3DShaderContext); if (fProxy) { size += fProxy->contextSize(); @@ -588,7 +588,7 @@ public: return size; } - virtual Context* onCreateContext(const ContextRec& rec, void* storage) const SK_OVERRIDE { + Context* onCreateContext(const ContextRec& rec, void* storage) const SK_OVERRIDE { SkShader::Context* proxyContext = NULL; if (fProxy) { char* proxyContextStorage = (char*) storage + sizeof(Sk3DShaderContext); @@ -620,9 +620,9 @@ public: } } - virtual void set3DMask(const SkMask* mask) SK_OVERRIDE { fMask = mask; } + void set3DMask(const SkMask* mask) SK_OVERRIDE { fMask = mask; } - virtual void shadeSpan(int x, int y, SkPMColor span[], int count) SK_OVERRIDE { + void shadeSpan(int x, int y, SkPMColor span[], int count) SK_OVERRIDE { if (fProxyContext) { fProxyContext->shadeSpan(x, y, span, count); } @@ -697,7 +697,7 @@ public: }; #ifndef SK_IGNORE_TO_STRING - virtual void toString(SkString* str) const SK_OVERRIDE { + void toString(SkString* str) const SK_OVERRIDE { str->append("Sk3DShader: ("); if (fProxy) { @@ -714,7 +714,7 @@ public: SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(Sk3DShader) protected: - virtual void flatten(SkWriteBuffer& buffer) const SK_OVERRIDE { + void flatten(SkWriteBuffer& buffer) const SK_OVERRIDE { buffer.writeFlattenable(fProxy); } @@ -736,7 +736,7 @@ public: , fShaderContext(shaderContext) {} - virtual void blitH(int x, int y, int width) SK_OVERRIDE { + void blitH(int x, int y, int width) SK_OVERRIDE { fProxy->blitH(x, y, width); } @@ -745,15 +745,15 @@ public: fProxy->blitAntiH(x, y, antialias, runs); } - virtual void blitV(int x, int y, int height, SkAlpha alpha) SK_OVERRIDE { + void blitV(int x, int y, int height, SkAlpha alpha) SK_OVERRIDE { fProxy->blitV(x, y, height, alpha); } - virtual void blitRect(int x, int y, int width, int height) SK_OVERRIDE { + void blitRect(int x, int y, int width, int height) SK_OVERRIDE { fProxy->blitRect(x, y, width, height); } - virtual void blitMask(const SkMask& mask, const SkIRect& clip) SK_OVERRIDE { + void blitMask(const SkMask& mask, const SkIRect& clip) SK_OVERRIDE { if (mask.fFormat == SkMask::k3D_Format) { fShaderContext->set3DMask(&mask); @@ -991,7 +991,7 @@ public: // Override rec with the identity matrix, so it is guaranteed to be invertible. : INHERITED(shader, SkShader::ContextRec(*rec.fDevice, *rec.fPaint, SkMatrix::I())) {} - virtual void shadeSpan(int x, int y, SkPMColor colors[], int count) SK_OVERRIDE { + void shadeSpan(int x, int y, SkPMColor colors[], int count) SK_OVERRIDE { sk_bzero(colors, count * sizeof(SkPMColor)); } diff --git a/src/core/SkBlitter.h b/src/core/SkBlitter.h index e0e77cc6be..b0745c8a27 100644 --- a/src/core/SkBlitter.h +++ b/src/core/SkBlitter.h @@ -119,14 +119,14 @@ private: */ class SkNullBlitter : public SkBlitter { public: - virtual void blitH(int x, int y, int width) SK_OVERRIDE; + void blitH(int x, int y, int width) SK_OVERRIDE; virtual void blitAntiH(int x, int y, const SkAlpha[], const int16_t runs[]) SK_OVERRIDE; - virtual void blitV(int x, int y, int height, SkAlpha alpha) SK_OVERRIDE; - virtual void blitRect(int x, int y, int width, int height) SK_OVERRIDE; - virtual void blitMask(const SkMask&, const SkIRect& clip) SK_OVERRIDE; - virtual const SkBitmap* justAnOpaqueColor(uint32_t* value) SK_OVERRIDE; - virtual bool isNullBlitter() const SK_OVERRIDE; + void blitV(int x, int y, int height, SkAlpha alpha) SK_OVERRIDE; + void blitRect(int x, int y, int width, int height) SK_OVERRIDE; + void blitMask(const SkMask&, const SkIRect& clip) SK_OVERRIDE; + const SkBitmap* justAnOpaqueColor(uint32_t* value) SK_OVERRIDE; + bool isNullBlitter() const SK_OVERRIDE; }; /** Wraps another (real) blitter, and ensures that the real blitter is only @@ -141,21 +141,21 @@ public: fClipRect = clipRect; } - virtual void blitH(int x, int y, int width) SK_OVERRIDE; + void blitH(int x, int y, int width) SK_OVERRIDE; virtual void blitAntiH(int x, int y, const SkAlpha[], const int16_t runs[]) SK_OVERRIDE; - virtual void blitV(int x, int y, int height, SkAlpha alpha) SK_OVERRIDE; - virtual void blitRect(int x, int y, int width, int height) SK_OVERRIDE; + void blitV(int x, int y, int height, SkAlpha alpha) SK_OVERRIDE; + void blitRect(int x, int y, int width, int height) SK_OVERRIDE; virtual void blitAntiRect(int x, int y, int width, int height, SkAlpha leftAlpha, SkAlpha rightAlpha) SK_OVERRIDE; - virtual void blitMask(const SkMask&, const SkIRect& clip) SK_OVERRIDE; - virtual const SkBitmap* justAnOpaqueColor(uint32_t* value) SK_OVERRIDE; + void blitMask(const SkMask&, const SkIRect& clip) SK_OVERRIDE; + const SkBitmap* justAnOpaqueColor(uint32_t* value) SK_OVERRIDE; - virtual int requestRowsPreserved() const SK_OVERRIDE { + int requestRowsPreserved() const SK_OVERRIDE { return fBlitter->requestRowsPreserved(); } - virtual void* allocBlitMemory(size_t sz) SK_OVERRIDE { + void* allocBlitMemory(size_t sz) SK_OVERRIDE { return fBlitter->allocBlitMemory(sz); } @@ -176,21 +176,21 @@ public: fRgn = clipRgn; } - virtual void blitH(int x, int y, int width) SK_OVERRIDE; + void blitH(int x, int y, int width) SK_OVERRIDE; virtual void blitAntiH(int x, int y, const SkAlpha[], const int16_t runs[]) SK_OVERRIDE; - virtual void blitV(int x, int y, int height, SkAlpha alpha) SK_OVERRIDE; - virtual void blitRect(int x, int y, int width, int height) SK_OVERRIDE; + void blitV(int x, int y, int height, SkAlpha alpha) SK_OVERRIDE; + void blitRect(int x, int y, int width, int height) SK_OVERRIDE; virtual void blitAntiRect(int x, int y, int width, int height, SkAlpha leftAlpha, SkAlpha rightAlpha) SK_OVERRIDE; - virtual void blitMask(const SkMask&, const SkIRect& clip) SK_OVERRIDE; - virtual const SkBitmap* justAnOpaqueColor(uint32_t* value) SK_OVERRIDE; + void blitMask(const SkMask&, const SkIRect& clip) SK_OVERRIDE; + const SkBitmap* justAnOpaqueColor(uint32_t* value) SK_OVERRIDE; - virtual int requestRowsPreserved() const SK_OVERRIDE { + int requestRowsPreserved() const SK_OVERRIDE { return fBlitter->requestRowsPreserved(); } - virtual void* allocBlitMemory(size_t sz) SK_OVERRIDE { + void* allocBlitMemory(size_t sz) SK_OVERRIDE { return fBlitter->allocBlitMemory(sz); } diff --git a/src/core/SkBlitter_RGB16.cpp b/src/core/SkBlitter_RGB16.cpp index f8d663ff2f..7c30fb1ee0 100644 --- a/src/core/SkBlitter_RGB16.cpp +++ b/src/core/SkBlitter_RGB16.cpp @@ -59,14 +59,14 @@ void sk_dither_memset16(uint16_t dst[], uint16_t value, uint16_t other, class SkRGB16_Blitter : public SkRasterBlitter { public: SkRGB16_Blitter(const SkBitmap& device, const SkPaint& paint); - virtual void blitH(int x, int y, int width) SK_OVERRIDE; + void blitH(int x, int y, int width) SK_OVERRIDE; virtual void blitAntiH(int x, int y, const SkAlpha* antialias, const int16_t* runs) SK_OVERRIDE; - virtual void blitV(int x, int y, int height, SkAlpha alpha) SK_OVERRIDE; - virtual void blitRect(int x, int y, int width, int height) SK_OVERRIDE; + void blitV(int x, int y, int height, SkAlpha alpha) SK_OVERRIDE; + void blitRect(int x, int y, int width, int height) SK_OVERRIDE; virtual void blitMask(const SkMask&, const SkIRect&) SK_OVERRIDE; - virtual const SkBitmap* justAnOpaqueColor(uint32_t*) SK_OVERRIDE; + const SkBitmap* justAnOpaqueColor(uint32_t*) SK_OVERRIDE; protected: SkPMColor fSrcColor32; @@ -86,11 +86,11 @@ protected: class SkRGB16_Opaque_Blitter : public SkRGB16_Blitter { public: SkRGB16_Opaque_Blitter(const SkBitmap& device, const SkPaint& paint); - virtual void blitH(int x, int y, int width) SK_OVERRIDE; + void blitH(int x, int y, int width) SK_OVERRIDE; virtual void blitAntiH(int x, int y, const SkAlpha* antialias, const int16_t* runs) SK_OVERRIDE; - virtual void blitV(int x, int y, int height, SkAlpha alpha) SK_OVERRIDE; - virtual void blitRect(int x, int y, int width, int height) SK_OVERRIDE; + void blitV(int x, int y, int height, SkAlpha alpha) SK_OVERRIDE; + void blitRect(int x, int y, int width, int height) SK_OVERRIDE; virtual void blitMask(const SkMask&, const SkIRect&) SK_OVERRIDE; @@ -102,7 +102,7 @@ private: class SkRGB16_Black_Blitter : public SkRGB16_Opaque_Blitter { public: SkRGB16_Black_Blitter(const SkBitmap& device, const SkPaint& paint); - virtual void blitMask(const SkMask&, const SkIRect&) SK_OVERRIDE; + void blitMask(const SkMask&, const SkIRect&) SK_OVERRIDE; virtual void blitAntiH(int x, int y, const SkAlpha* antialias, const int16_t* runs) SK_OVERRIDE; @@ -116,10 +116,10 @@ public: SkRGB16_Shader_Blitter(const SkBitmap& device, const SkPaint& paint, SkShader::Context* shaderContext); virtual ~SkRGB16_Shader_Blitter(); - virtual void blitH(int x, int y, int width) SK_OVERRIDE; + void blitH(int x, int y, int width) SK_OVERRIDE; virtual void blitAntiH(int x, int y, const SkAlpha* antialias, const int16_t* runs) SK_OVERRIDE; - virtual void blitRect(int x, int y, int width, int height) SK_OVERRIDE; + void blitRect(int x, int y, int width, int height) SK_OVERRIDE; protected: SkPMColor* fBuffer; @@ -138,10 +138,10 @@ class SkRGB16_Shader16_Blitter : public SkRGB16_Shader_Blitter { public: SkRGB16_Shader16_Blitter(const SkBitmap& device, const SkPaint& paint, SkShader::Context* shaderContext); - virtual void blitH(int x, int y, int width) SK_OVERRIDE; + void blitH(int x, int y, int width) SK_OVERRIDE; virtual void blitAntiH(int x, int y, const SkAlpha* antialias, const int16_t* runs) SK_OVERRIDE; - virtual void blitRect(int x, int y, int width, int height) SK_OVERRIDE; + void blitRect(int x, int y, int width, int height) SK_OVERRIDE; private: typedef SkRGB16_Shader_Blitter INHERITED; @@ -152,7 +152,7 @@ public: SkRGB16_Shader_Xfermode_Blitter(const SkBitmap& device, const SkPaint& paint, SkShader::Context* shaderContext); virtual ~SkRGB16_Shader_Xfermode_Blitter(); - virtual void blitH(int x, int y, int width) SK_OVERRIDE; + void blitH(int x, int y, int width) SK_OVERRIDE; virtual void blitAntiH(int x, int y, const SkAlpha* antialias, const int16_t* runs) SK_OVERRIDE; diff --git a/src/core/SkBuffer.h b/src/core/SkBuffer.h index 9791cf55a1..96e225be3a 100644 --- a/src/core/SkBuffer.h +++ b/src/core/SkBuffer.h @@ -105,7 +105,7 @@ public: null and the number of bytes to read does not overflow this object's data, copy those bytes into buffer. */ - virtual bool read(void* buffer, size_t size) SK_OVERRIDE; + bool read(void* buffer, size_t size) SK_OVERRIDE; /** Returns whether or not a read operation attempted to read past the end of the data. */ diff --git a/src/core/SkColorShader.h b/src/core/SkColorShader.h index e024718623..9fbd5e1e8e 100644 --- a/src/core/SkColorShader.h +++ b/src/core/SkColorShader.h @@ -23,9 +23,9 @@ public: */ explicit SkColorShader(SkColor c); - virtual bool isOpaque() const SK_OVERRIDE; + bool isOpaque() const SK_OVERRIDE; - virtual size_t contextSize() const SK_OVERRIDE { + size_t contextSize() const SK_OVERRIDE { return sizeof(ColorShaderContext); } @@ -33,11 +33,11 @@ public: public: ColorShaderContext(const SkColorShader& shader, const ContextRec&); - virtual uint32_t getFlags() const SK_OVERRIDE; - virtual uint8_t getSpan16Alpha() const SK_OVERRIDE; - virtual void shadeSpan(int x, int y, SkPMColor span[], int count) SK_OVERRIDE; - virtual void shadeSpan16(int x, int y, uint16_t span[], int count) SK_OVERRIDE; - virtual void shadeSpanAlpha(int x, int y, uint8_t alpha[], int count) SK_OVERRIDE; + uint32_t getFlags() const SK_OVERRIDE; + uint8_t getSpan16Alpha() const SK_OVERRIDE; + void shadeSpan(int x, int y, SkPMColor span[], int count) SK_OVERRIDE; + void shadeSpan16(int x, int y, uint16_t span[], int count) SK_OVERRIDE; + void shadeSpanAlpha(int x, int y, uint8_t alpha[], int count) SK_OVERRIDE; private: SkPMColor fPMColor; @@ -52,7 +52,7 @@ public: SkMatrix* outMatrix, TileMode xy[2]) 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*, @@ -63,9 +63,9 @@ public: protected: SkColorShader(SkReadBuffer&); - virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; - virtual Context* onCreateContext(const ContextRec&, void* storage) const SK_OVERRIDE; - virtual bool onAsLuminanceColor(SkColor* lum) const SK_OVERRIDE { + void flatten(SkWriteBuffer&) const SK_OVERRIDE; + Context* onCreateContext(const ContextRec&, void* storage) const SK_OVERRIDE; + bool onAsLuminanceColor(SkColor* lum) const SK_OVERRIDE { *lum = fColor; return true; } diff --git a/src/core/SkCoreBlitters.h b/src/core/SkCoreBlitters.h index 20f9437ac8..60211c98b3 100644 --- a/src/core/SkCoreBlitters.h +++ b/src/core/SkCoreBlitters.h @@ -41,9 +41,9 @@ public: * Will create the context at the same location as the old one (this is safe * because the shader itself is unchanged). */ - virtual bool resetShaderContext(const SkShader::ContextRec&) SK_OVERRIDE; + bool resetShaderContext(const SkShader::ContextRec&) SK_OVERRIDE; - virtual SkShader::Context* getShaderContext() const SK_OVERRIDE { return fShaderContext; } + SkShader::Context* getShaderContext() const SK_OVERRIDE { return fShaderContext; } protected: uint32_t fShaderFlags; @@ -62,12 +62,12 @@ private: class SkA8_Coverage_Blitter : public SkRasterBlitter { public: SkA8_Coverage_Blitter(const SkBitmap& device, const SkPaint& paint); - virtual void blitH(int x, int y, int width) SK_OVERRIDE; - virtual void blitAntiH(int x, int y, const SkAlpha antialias[], const int16_t runs[]) SK_OVERRIDE; - virtual void blitV(int x, int y, int height, SkAlpha alpha) SK_OVERRIDE; - virtual void blitRect(int x, int y, int width, int height) SK_OVERRIDE; - virtual void blitMask(const SkMask&, const SkIRect&) SK_OVERRIDE; - virtual const SkBitmap* justAnOpaqueColor(uint32_t*) SK_OVERRIDE; + void blitH(int x, int y, int width) SK_OVERRIDE; + void blitAntiH(int x, int y, const SkAlpha antialias[], const int16_t runs[]) SK_OVERRIDE; + void blitV(int x, int y, int height, SkAlpha alpha) SK_OVERRIDE; + void blitRect(int x, int y, int width, int height) SK_OVERRIDE; + void blitMask(const SkMask&, const SkIRect&) SK_OVERRIDE; + const SkBitmap* justAnOpaqueColor(uint32_t*) SK_OVERRIDE; }; class SkA8_Blitter : public SkRasterBlitter { @@ -161,11 +161,11 @@ public: SkARGB32_Shader_Blitter(const SkBitmap& device, const SkPaint& paint, SkShader::Context* shaderContext); virtual ~SkARGB32_Shader_Blitter(); - virtual void blitH(int x, int y, int width) SK_OVERRIDE; - virtual void blitV(int x, int y, int height, SkAlpha alpha) SK_OVERRIDE; - virtual void blitRect(int x, int y, int width, int height) SK_OVERRIDE; - virtual void blitAntiH(int x, int y, const SkAlpha[], const int16_t[]) SK_OVERRIDE; - virtual void blitMask(const SkMask&, const SkIRect&) SK_OVERRIDE; + void blitH(int x, int y, int width) SK_OVERRIDE; + void blitV(int x, int y, int height, SkAlpha alpha) SK_OVERRIDE; + void blitRect(int x, int y, int width, int height) SK_OVERRIDE; + void blitAntiH(int x, int y, const SkAlpha[], const int16_t[]) SK_OVERRIDE; + void blitMask(const SkMask&, const SkIRect&) SK_OVERRIDE; private: SkXfermode* fXfermode; diff --git a/src/core/SkDeviceImageFilterProxy.h b/src/core/SkDeviceImageFilterProxy.h index 621ff3f507..0ae686d877 100644 --- a/src/core/SkDeviceImageFilterProxy.h +++ b/src/core/SkDeviceImageFilterProxy.h @@ -22,13 +22,13 @@ public: props.pixelGeometry())) {} - virtual SkBaseDevice* createDevice(int w, int h) SK_OVERRIDE { + SkBaseDevice* createDevice(int w, int h) SK_OVERRIDE { SkBaseDevice::CreateInfo cinfo(SkImageInfo::MakeN32Premul(w, h), SkBaseDevice::kImageFilter_Usage, kUnknown_SkPixelGeometry); return fDevice->onCreateCompatibleDevice(cinfo); } - virtual bool canHandleImageFilter(const SkImageFilter* filter) SK_OVERRIDE { + bool canHandleImageFilter(const SkImageFilter* filter) SK_OVERRIDE { return fDevice->canHandleImageFilter(filter); } virtual bool filterImage(const SkImageFilter* filter, const SkBitmap& src, @@ -37,7 +37,7 @@ public: return fDevice->filterImage(filter, src, ctx, result, offset); } - virtual const SkSurfaceProps* surfaceProps() const SK_OVERRIDE { + const SkSurfaceProps* surfaceProps() const SK_OVERRIDE { return &fProps; } diff --git a/src/core/SkDraw.cpp b/src/core/SkDraw.cpp index 1e1ce07631..60075322b6 100644 --- a/src/core/SkDraw.cpp +++ b/src/core/SkDraw.cpp @@ -2016,7 +2016,7 @@ class SkTriColorShader : public SkShader { public: SkTriColorShader() {} - virtual size_t contextSize() const SK_OVERRIDE; + size_t contextSize() const SK_OVERRIDE; class TriColorShaderContext : public SkShader::Context { public: @@ -2025,7 +2025,7 @@ public: bool setup(const SkPoint pts[], const SkColor colors[], int, int, int); - 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: SkMatrix fDstToUnit; @@ -2040,7 +2040,7 @@ public: Factory getFactory() const SK_OVERRIDE { sk_throw(); return NULL; } protected: - virtual Context* onCreateContext(const ContextRec& rec, void* storage) const SK_OVERRIDE { + Context* onCreateContext(const ContextRec& rec, void* storage) const SK_OVERRIDE { return SkNEW_PLACEMENT_ARGS(storage, TriColorShaderContext, (*this, rec)); } diff --git a/src/core/SkEmptyShader.h b/src/core/SkEmptyShader.h index b7fefbe109..0de85caf5b 100644 --- a/src/core/SkEmptyShader.h +++ b/src/core/SkEmptyShader.h @@ -20,7 +20,7 @@ class SK_API SkEmptyShader : public SkShader { public: SkEmptyShader() {} - virtual size_t contextSize() const SK_OVERRIDE { + size_t contextSize() const SK_OVERRIDE { // Even though createContext returns NULL we have to return a value of at least // sizeof(SkShader::Context) to satisfy SkSmallAllocator. return sizeof(SkShader::Context); @@ -30,7 +30,7 @@ public: SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkEmptyShader) protected: - virtual SkShader::Context* onCreateContext(const ContextRec&, void*) const SK_OVERRIDE { + SkShader::Context* onCreateContext(const ContextRec&, void*) const SK_OVERRIDE { return NULL; } diff --git a/src/core/SkFilterShader.h b/src/core/SkFilterShader.h index 44c2632711..dca9567e66 100644 --- a/src/core/SkFilterShader.h +++ b/src/core/SkFilterShader.h @@ -17,7 +17,7 @@ public: SkFilterShader(SkShader* shader, SkColorFilter* filter); virtual ~SkFilterShader(); - virtual size_t contextSize() const SK_OVERRIDE; + size_t contextSize() const SK_OVERRIDE; class FilterShaderContext : public SkShader::Context { public: @@ -25,12 +25,12 @@ public: FilterShaderContext(const SkFilterShader&, SkShader::Context*, const ContextRec&); virtual ~FilterShaderContext(); - virtual uint32_t getFlags() const SK_OVERRIDE; + uint32_t getFlags() const SK_OVERRIDE; - virtual void shadeSpan(int x, int y, SkPMColor[], int count) SK_OVERRIDE; - virtual void shadeSpan16(int x, int y, uint16_t[], int count) SK_OVERRIDE; + void shadeSpan(int x, int y, SkPMColor[], int count) SK_OVERRIDE; + void shadeSpan16(int x, int y, uint16_t[], int count) SK_OVERRIDE; - virtual void set3DMask(const SkMask* mask) SK_OVERRIDE { + void set3DMask(const SkMask* mask) SK_OVERRIDE { // forward to our proxy fShaderContext->set3DMask(mask); } @@ -45,8 +45,8 @@ public: SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkFilterShader) protected: - virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; - virtual Context* onCreateContext(const ContextRec&, void* storage) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const SK_OVERRIDE; + Context* onCreateContext(const ContextRec&, void* storage) const SK_OVERRIDE; private: diff --git a/src/core/SkFontHost.cpp b/src/core/SkFontHost.cpp index 79b7b7302e..8092a590c2 100644 --- a/src/core/SkFontHost.cpp +++ b/src/core/SkFontHost.cpp @@ -80,15 +80,15 @@ SkFontStyle::SkFontStyle(unsigned oldStyle) { class SkEmptyFontStyleSet : public SkFontStyleSet { public: - virtual int count() SK_OVERRIDE { return 0; } - virtual void getStyle(int, SkFontStyle*, SkString*) SK_OVERRIDE { + int count() SK_OVERRIDE { return 0; } + void getStyle(int, SkFontStyle*, SkString*) SK_OVERRIDE { SkDEBUGFAIL("SkFontStyleSet::getStyle called on empty set"); } - virtual SkTypeface* createTypeface(int index) SK_OVERRIDE { + SkTypeface* createTypeface(int index) SK_OVERRIDE { SkDEBUGFAIL("SkFontStyleSet::createTypeface called on empty set"); return NULL; } - virtual SkTypeface* matchStyle(const SkFontStyle&) SK_OVERRIDE { + SkTypeface* matchStyle(const SkFontStyle&) SK_OVERRIDE { return NULL; } }; @@ -101,17 +101,17 @@ SkFontStyleSet* SkFontStyleSet::CreateEmpty() { class SkEmptyFontMgr : public SkFontMgr { protected: - virtual int onCountFamilies() const SK_OVERRIDE { + int onCountFamilies() const SK_OVERRIDE { return 0; } - virtual void onGetFamilyName(int index, SkString* familyName) const SK_OVERRIDE { + void onGetFamilyName(int index, SkString* familyName) const SK_OVERRIDE { SkDEBUGFAIL("onGetFamilyName called with bad index"); } - virtual SkFontStyleSet* onCreateStyleSet(int index) const SK_OVERRIDE { + SkFontStyleSet* onCreateStyleSet(int index) const SK_OVERRIDE { SkDEBUGFAIL("onCreateStyleSet called with bad index"); return NULL; } - virtual SkFontStyleSet* onMatchFamily(const char[]) const SK_OVERRIDE { + SkFontStyleSet* onMatchFamily(const char[]) const SK_OVERRIDE { return SkFontStyleSet::CreateEmpty(); } @@ -130,16 +130,16 @@ protected: const SkFontStyle&) const SK_OVERRIDE { return NULL; } - virtual SkTypeface* onCreateFromData(SkData*, int) const SK_OVERRIDE { + SkTypeface* onCreateFromData(SkData*, int) const SK_OVERRIDE { return NULL; } - virtual SkTypeface* onCreateFromStream(SkStream*, int) const SK_OVERRIDE { + SkTypeface* onCreateFromStream(SkStream*, int) const SK_OVERRIDE { return NULL; } - virtual SkTypeface* onCreateFromFile(const char[], int) const SK_OVERRIDE { + SkTypeface* onCreateFromFile(const char[], int) const SK_OVERRIDE { return NULL; } - virtual SkTypeface* onLegacyCreateTypeface(const char [], unsigned) const SK_OVERRIDE { + SkTypeface* onLegacyCreateTypeface(const char [], unsigned) const SK_OVERRIDE { return NULL; } }; diff --git a/src/core/SkImageFilter.cpp b/src/core/SkImageFilter.cpp index 3285e220de..34b1b9bc3e 100644 --- a/src/core/SkImageFilter.cpp +++ b/src/core/SkImageFilter.cpp @@ -432,7 +432,7 @@ public: } SK_DECLARE_INTERNAL_LLIST_INTERFACE(Value); }; - virtual bool get(const Key& key, SkBitmap* result, SkIPoint* offset) const SK_OVERRIDE { + bool get(const Key& key, SkBitmap* result, SkIPoint* offset) const SK_OVERRIDE { SkAutoMutexAcquire mutex(fMutex); if (Value* v = fLookup.find(key)) { *result = v->fBitmap; @@ -445,7 +445,7 @@ public: } return false; } - virtual void set(const Key& key, const SkBitmap& result, const SkIPoint& offset) SK_OVERRIDE { + void set(const Key& key, const SkBitmap& result, const SkIPoint& offset) SK_OVERRIDE { SkAutoMutexAcquire mutex(fMutex); if (Value* v = fLookup.find(key)) { removeInternal(v); diff --git a/src/core/SkLocalMatrixShader.h b/src/core/SkLocalMatrixShader.h index 0a5cb7a71b..be78bee110 100644 --- a/src/core/SkLocalMatrixShader.h +++ b/src/core/SkLocalMatrixShader.h @@ -19,7 +19,7 @@ public: , fProxyShader(SkRef(proxy)) {} - virtual size_t contextSize() const SK_OVERRIDE { + size_t contextSize() const SK_OVERRIDE { return fProxyShader->contextSize(); } @@ -28,7 +28,7 @@ public: return fProxyShader->asABitmap(bitmap, matrix, mode); } - virtual GradientType asAGradient(GradientInfo* info) const SK_OVERRIDE { + GradientType asAGradient(GradientInfo* info) const SK_OVERRIDE { return fProxyShader->asAGradient(info); } @@ -55,7 +55,7 @@ public: #endif - virtual SkShader* refAsALocalMatrixShader(SkMatrix* localMatrix) const SK_OVERRIDE { + SkShader* refAsALocalMatrixShader(SkMatrix* localMatrix) const SK_OVERRIDE { if (localMatrix) { *localMatrix = this->getLocalMatrix(); } @@ -66,8 +66,8 @@ public: SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkLocalMatrixShader) protected: - virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; - virtual Context* onCreateContext(const ContextRec&, void*) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const SK_OVERRIDE; + Context* onCreateContext(const ContextRec&, void*) const SK_OVERRIDE; private: SkAutoTUnref<SkShader> fProxyShader; diff --git a/src/core/SkMaskCache.cpp b/src/core/SkMaskCache.cpp index b4b8b4faf3..a360fc56d7 100644 --- a/src/core/SkMaskCache.cpp +++ b/src/core/SkMaskCache.cpp @@ -51,8 +51,8 @@ struct RRectBlurRec : public SkResourceCache::Rec { RRectBlurKey fKey; MaskValue fValue; - virtual const Key& getKey() const SK_OVERRIDE { return fKey; } - virtual size_t bytesUsed() const SK_OVERRIDE { return sizeof(*this) + fValue.fData->size(); } + const Key& getKey() const SK_OVERRIDE { return fKey; } + size_t bytesUsed() const SK_OVERRIDE { return sizeof(*this) + fValue.fData->size(); } static bool Visitor(const SkResourceCache::Rec& baseRec, void* contextData) { const RRectBlurRec& rec = static_cast<const RRectBlurRec&>(baseRec); @@ -142,8 +142,8 @@ struct RectsBlurRec : public SkResourceCache::Rec { RectsBlurKey fKey; MaskValue fValue; - virtual const Key& getKey() const SK_OVERRIDE { return fKey; } - virtual size_t bytesUsed() const SK_OVERRIDE { return sizeof(*this) + fValue.fData->size(); } + const Key& getKey() const SK_OVERRIDE { return fKey; } + size_t bytesUsed() const SK_OVERRIDE { return sizeof(*this) + fValue.fData->size(); } static bool Visitor(const SkResourceCache::Rec& baseRec, void* contextData) { const RectsBlurRec& rec = static_cast<const RectsBlurRec&>(baseRec); diff --git a/src/core/SkMaskGamma.cpp b/src/core/SkMaskGamma.cpp index a305d72162..abc729baae 100644 --- a/src/core/SkMaskGamma.cpp +++ b/src/core/SkMaskGamma.cpp @@ -12,27 +12,27 @@ #include "SkMaskGamma.h" class SkLinearColorSpaceLuminance : public SkColorSpaceLuminance { - virtual SkScalar toLuma(SkScalar SkDEBUGCODE(gamma), SkScalar luminance) const SK_OVERRIDE { + SkScalar toLuma(SkScalar SkDEBUGCODE(gamma), SkScalar luminance) const SK_OVERRIDE { SkASSERT(SK_Scalar1 == gamma); return luminance; } - virtual SkScalar fromLuma(SkScalar SkDEBUGCODE(gamma), SkScalar luma) const SK_OVERRIDE { + SkScalar fromLuma(SkScalar SkDEBUGCODE(gamma), SkScalar luma) const SK_OVERRIDE { SkASSERT(SK_Scalar1 == gamma); return luma; } }; class SkGammaColorSpaceLuminance : public SkColorSpaceLuminance { - virtual SkScalar toLuma(SkScalar gamma, SkScalar luminance) const SK_OVERRIDE { + SkScalar toLuma(SkScalar gamma, SkScalar luminance) const SK_OVERRIDE { return SkScalarPow(luminance, gamma); } - virtual SkScalar fromLuma(SkScalar gamma, SkScalar luma) const SK_OVERRIDE { + SkScalar fromLuma(SkScalar gamma, SkScalar luma) const SK_OVERRIDE { return SkScalarPow(luma, SkScalarInvert(gamma)); } }; class SkSRGBColorSpaceLuminance : public SkColorSpaceLuminance { - virtual SkScalar toLuma(SkScalar SkDEBUGCODE(gamma), SkScalar luminance) const SK_OVERRIDE { + SkScalar toLuma(SkScalar SkDEBUGCODE(gamma), SkScalar luminance) const SK_OVERRIDE { SkASSERT(0 == gamma); //The magic numbers are derived from the sRGB specification. //See http://www.color.org/chardata/rgb/srgb.xalter . @@ -42,7 +42,7 @@ class SkSRGBColorSpaceLuminance : public SkColorSpaceLuminance { return SkScalarPow((luminance + 0.055f) / 1.055f, 2.4f); } - virtual SkScalar fromLuma(SkScalar SkDEBUGCODE(gamma), SkScalar luma) const SK_OVERRIDE { + SkScalar fromLuma(SkScalar SkDEBUGCODE(gamma), SkScalar luma) const SK_OVERRIDE { SkASSERT(0 == gamma); //The magic numbers are derived from the sRGB specification. //See http://www.color.org/chardata/rgb/srgb.xalter . diff --git a/src/core/SkMipMap.h b/src/core/SkMipMap.h index 4e83b12b3e..d4039687c0 100644 --- a/src/core/SkMipMap.h +++ b/src/core/SkMipMap.h @@ -30,7 +30,7 @@ public: bool extractLevel(SkScalar scale, Level*) const; protected: - virtual void onDataChange(void* oldData, void* newData) SK_OVERRIDE { + void onDataChange(void* oldData, void* newData) SK_OVERRIDE { fLevels = (Level*)newData; // could be NULL } diff --git a/src/core/SkPictureRecord.h b/src/core/SkPictureRecord.h index ca2c13329c..3ce0007a3c 100644 --- a/src/core/SkPictureRecord.h +++ b/src/core/SkPictureRecord.h @@ -29,9 +29,9 @@ public: SkPictureRecord(const SkISize& dimensions, uint32_t recordFlags); virtual ~SkPictureRecord(); - virtual void beginCommentGroup(const char* description) SK_OVERRIDE; - virtual void addComment(const char* kywd, const char* value) SK_OVERRIDE; - virtual void endCommentGroup() SK_OVERRIDE; + void beginCommentGroup(const char* description) SK_OVERRIDE; + void addComment(const char* kywd, const char* value) SK_OVERRIDE; + void endCommentGroup() SK_OVERRIDE; const SkTDArray<const SkPicture* >& getPictureRefs() const { return fPictureRefs; @@ -146,19 +146,19 @@ protected: SkASSERT(fWriter.bytesWritten() == initialOffset + size); } - virtual SkSurface* onNewSurface(const SkImageInfo&, const SkSurfaceProps&) SK_OVERRIDE; + SkSurface* onNewSurface(const SkImageInfo&, const SkSurfaceProps&) SK_OVERRIDE; const void* onPeekPixels(SkImageInfo*, size_t*) SK_OVERRIDE { return NULL; } - virtual void willSave() SK_OVERRIDE; - virtual SaveLayerStrategy willSaveLayer(const SkRect*, const SkPaint*, SaveFlags) SK_OVERRIDE; - virtual void willRestore() SK_OVERRIDE; + void willSave() SK_OVERRIDE; + SaveLayerStrategy willSaveLayer(const SkRect*, const SkPaint*, SaveFlags) SK_OVERRIDE; + void willRestore() SK_OVERRIDE; - virtual void didConcat(const SkMatrix&) SK_OVERRIDE; - virtual void didSetMatrix(const SkMatrix&) SK_OVERRIDE; + void didConcat(const SkMatrix&) SK_OVERRIDE; + void didSetMatrix(const SkMatrix&) SK_OVERRIDE; - virtual void onDrawDRRect(const SkRRect&, const SkRRect&, const SkPaint&) SK_OVERRIDE; + void onDrawDRRect(const SkRRect&, const SkRRect&, const SkPaint&) SK_OVERRIDE; virtual void onDrawText(const void* text, size_t byteLength, SkScalar x, SkScalar y, const SkPaint&) SK_OVERRIDE; @@ -199,12 +199,12 @@ protected: const uint16_t indices[], int indexCount, const SkPaint&) SK_OVERRIDE; - virtual void onClipRect(const SkRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; - virtual void onClipRRect(const SkRRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; - virtual void onClipPath(const SkPath&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; - virtual void onClipRegion(const SkRegion&, SkRegion::Op) SK_OVERRIDE; + void onClipRect(const SkRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; + void onClipRRect(const SkRRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; + void onClipPath(const SkPath&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; + void onClipRegion(const SkRegion&, SkRegion::Op) SK_OVERRIDE; - virtual void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint*) SK_OVERRIDE; + void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint*) SK_OVERRIDE; int addPathToHeap(const SkPath& path); // does not write to ops stream diff --git a/src/core/SkPictureShader.cpp b/src/core/SkPictureShader.cpp index b602294a09..5a1e61849d 100644 --- a/src/core/SkPictureShader.cpp +++ b/src/core/SkPictureShader.cpp @@ -70,8 +70,8 @@ struct BitmapShaderRec : public SkResourceCache::Rec { SkAutoTUnref<SkShader> fShader; size_t fBitmapBytes; - virtual const Key& getKey() const SK_OVERRIDE { return fKey; } - virtual size_t bytesUsed() const SK_OVERRIDE { + const Key& getKey() const SK_OVERRIDE { return fKey; } + size_t bytesUsed() const SK_OVERRIDE { return sizeof(fKey) + sizeof(SkShader) + fBitmapBytes; } diff --git a/src/core/SkPictureShader.h b/src/core/SkPictureShader.h index 5f8cc01aad..8df9f539b8 100644 --- a/src/core/SkPictureShader.h +++ b/src/core/SkPictureShader.h @@ -25,7 +25,7 @@ public: const SkRect*); virtual ~SkPictureShader(); - virtual size_t contextSize() const SK_OVERRIDE; + size_t contextSize() const SK_OVERRIDE; SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkPictureShader) @@ -35,8 +35,8 @@ public: protected: SkPictureShader(SkReadBuffer&); - virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; - virtual Context* onCreateContext(const ContextRec&, void* storage) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const SK_OVERRIDE; + Context* onCreateContext(const ContextRec&, void* storage) const SK_OVERRIDE; private: SkPictureShader(const SkPicture*, TileMode, TileMode, const SkMatrix*, const SkRect*); @@ -54,11 +54,11 @@ private: virtual ~PictureShaderContext(); - virtual uint32_t getFlags() const SK_OVERRIDE; + uint32_t getFlags() const SK_OVERRIDE; - virtual ShadeProc asAShadeProc(void** ctx) SK_OVERRIDE; - 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; + ShadeProc asAShadeProc(void** ctx) 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: PictureShaderContext(const SkPictureShader&, const ContextRec&, SkShader* bitmapShader); diff --git a/src/core/SkRTree.h b/src/core/SkRTree.h index 4021c0980b..7934324b5d 100644 --- a/src/core/SkRTree.h +++ b/src/core/SkRTree.h @@ -41,9 +41,9 @@ public: explicit SkRTree(SkScalar aspectRatio = 1); virtual ~SkRTree() {} - virtual void insert(SkAutoTMalloc<SkRect>* boundsArray, int N) SK_OVERRIDE; - virtual void search(const SkRect& query, SkTDArray<unsigned>* results) const SK_OVERRIDE; - virtual size_t bytesUsed() const SK_OVERRIDE; + void insert(SkAutoTMalloc<SkRect>* boundsArray, int N) SK_OVERRIDE; + void search(const SkRect& query, SkTDArray<unsigned>* results) const SK_OVERRIDE; + size_t bytesUsed() const SK_OVERRIDE; // Methods and constants below here are only public for tests. diff --git a/src/core/SkRegion_path.cpp b/src/core/SkRegion_path.cpp index c3c0423888..e9224d824e 100644 --- a/src/core/SkRegion_path.cpp +++ b/src/core/SkRegion_path.cpp @@ -43,7 +43,7 @@ public: void copyToRect(SkIRect*) const; void copyToRgn(SkRegion::RunType runs[]) const; - virtual void blitH(int x, int y, int width) SK_OVERRIDE; + void blitH(int x, int y, int width) SK_OVERRIDE; #ifdef SK_DEBUG void dump() const { diff --git a/src/core/SkResourceCache.cpp b/src/core/SkResourceCache.cpp index ae8412d8b4..efcff26c1a 100644 --- a/src/core/SkResourceCache.cpp +++ b/src/core/SkResourceCache.cpp @@ -73,9 +73,9 @@ public: ~SkOneShotDiscardablePixelRef(); protected: - virtual bool onNewLockPixels(LockRec*) SK_OVERRIDE; - virtual void onUnlockPixels() SK_OVERRIDE; - virtual size_t getAllocatedSizeInBytes() const SK_OVERRIDE; + bool onNewLockPixels(LockRec*) SK_OVERRIDE; + void onUnlockPixels() SK_OVERRIDE; + size_t getAllocatedSizeInBytes() const SK_OVERRIDE; private: SkDiscardableMemory* fDM; @@ -143,7 +143,7 @@ public: fFactory = factory; } - virtual bool allocPixelRef(SkBitmap*, SkColorTable*) SK_OVERRIDE; + bool allocPixelRef(SkBitmap*, SkColorTable*) SK_OVERRIDE; private: SkResourceCache::DiscardableFactory fFactory; diff --git a/src/core/SkScalerContext.cpp b/src/core/SkScalerContext.cpp index 771db50425..dad8e5eb21 100644 --- a/src/core/SkScalerContext.cpp +++ b/src/core/SkScalerContext.cpp @@ -856,21 +856,21 @@ public: : SkScalerContext(face, desc) {} protected: - virtual unsigned generateGlyphCount() SK_OVERRIDE { + unsigned generateGlyphCount() SK_OVERRIDE { return 0; } - virtual uint16_t generateCharToGlyph(SkUnichar uni) SK_OVERRIDE { + uint16_t generateCharToGlyph(SkUnichar uni) SK_OVERRIDE { return 0; } - virtual void generateAdvance(SkGlyph* glyph) SK_OVERRIDE { + void generateAdvance(SkGlyph* glyph) SK_OVERRIDE { glyph->zeroMetrics(); } - virtual void generateMetrics(SkGlyph* glyph) SK_OVERRIDE { + void generateMetrics(SkGlyph* glyph) SK_OVERRIDE { glyph->zeroMetrics(); } - virtual void generateImage(const SkGlyph& glyph) SK_OVERRIDE {} - virtual void generatePath(const SkGlyph& glyph, SkPath* path) SK_OVERRIDE {} - virtual void generateFontMetrics(SkPaint::FontMetrics* metrics) SK_OVERRIDE { + void generateImage(const SkGlyph& glyph) SK_OVERRIDE {} + void generatePath(const SkGlyph& glyph, SkPath* path) SK_OVERRIDE {} + void generateFontMetrics(SkPaint::FontMetrics* metrics) SK_OVERRIDE { if (metrics) { sk_bzero(metrics, sizeof(*metrics)); } diff --git a/src/core/SkScan_AntiPath.cpp b/src/core/SkScan_AntiPath.cpp index 545a70129e..4329ef5273 100644 --- a/src/core/SkScan_AntiPath.cpp +++ b/src/core/SkScan_AntiPath.cpp @@ -53,7 +53,7 @@ public: SkDEBUGFAIL("How did I get here?"); } /// May not be called on BaseSuperBlitter because it blits out of order. - virtual void blitV(int x, int y, int height, SkAlpha alpha) SK_OVERRIDE { + void blitV(int x, int y, int height, SkAlpha alpha) SK_OVERRIDE { SkDEBUGFAIL("How did I get here?"); } @@ -120,10 +120,10 @@ public: /// Blits a row of pixels, with location and width specified /// in supersampled coordinates. - virtual void blitH(int x, int y, int width) SK_OVERRIDE; + void blitH(int x, int y, int width) SK_OVERRIDE; /// Blits a rectangle of pixels, with location and size specified /// in supersampled coordinates. - virtual void blitRect(int x, int y, int width, int height) SK_OVERRIDE; + void blitRect(int x, int y, int width, int height) SK_OVERRIDE; private: // The next three variables are used to track a circular buffer that @@ -408,7 +408,7 @@ public: fRealBlitter->blitMask(fMask, fClipRect); } - virtual void blitH(int x, int y, int width) SK_OVERRIDE; + void blitH(int x, int y, int width) SK_OVERRIDE; static bool CanHandleRect(const SkIRect& bounds) { #ifdef FORCE_RLE diff --git a/src/core/SkScan_Antihair.cpp b/src/core/SkScan_Antihair.cpp index e31f66cc56..d0341510a9 100644 --- a/src/core/SkScan_Antihair.cpp +++ b/src/core/SkScan_Antihair.cpp @@ -106,7 +106,7 @@ private: class HLine_SkAntiHairBlitter : public SkAntiHairBlitter { public: - virtual SkFixed drawCap(int x, SkFixed fy, SkFixed slope, int mod64) SK_OVERRIDE { + SkFixed drawCap(int x, SkFixed fy, SkFixed slope, int mod64) SK_OVERRIDE { fy += SK_Fixed1/2; int y = fy >> 16; @@ -153,7 +153,7 @@ public: class Horish_SkAntiHairBlitter : public SkAntiHairBlitter { public: - virtual SkFixed drawCap(int x, SkFixed fy, SkFixed dy, int mod64) SK_OVERRIDE { + SkFixed drawCap(int x, SkFixed fy, SkFixed dy, int mod64) SK_OVERRIDE { int16_t runs[2]; uint8_t aa[1]; @@ -186,7 +186,7 @@ public: return fy - SK_Fixed1/2; } - virtual SkFixed drawLine(int x, int stopx, SkFixed fy, SkFixed dy) SK_OVERRIDE { + SkFixed drawLine(int x, int stopx, SkFixed fy, SkFixed dy) SK_OVERRIDE { SkASSERT(x < stopx); int16_t runs[2]; @@ -224,7 +224,7 @@ public: class VLine_SkAntiHairBlitter : public SkAntiHairBlitter { public: - virtual SkFixed drawCap(int y, SkFixed fx, SkFixed dx, int mod64) SK_OVERRIDE { + SkFixed drawCap(int y, SkFixed fx, SkFixed dx, int mod64) SK_OVERRIDE { SkASSERT(0 == dx); fx += SK_Fixed1/2; @@ -243,7 +243,7 @@ public: return fx - SK_Fixed1/2; } - virtual SkFixed drawLine(int y, int stopy, SkFixed fx, SkFixed dx) SK_OVERRIDE { + SkFixed drawLine(int y, int stopy, SkFixed fx, SkFixed dx) SK_OVERRIDE { SkASSERT(y < stopy); SkASSERT(0 == dx); fx += SK_Fixed1/2; @@ -265,7 +265,7 @@ public: class Vertish_SkAntiHairBlitter : public SkAntiHairBlitter { public: - virtual SkFixed drawCap(int y, SkFixed fx, SkFixed dx, int mod64) SK_OVERRIDE { + SkFixed drawCap(int y, SkFixed fx, SkFixed dx, int mod64) SK_OVERRIDE { int16_t runs[3]; uint8_t aa[2]; @@ -289,7 +289,7 @@ public: return fx - SK_Fixed1/2; } - virtual SkFixed drawLine(int y, int stopy, SkFixed fx, SkFixed dx) SK_OVERRIDE { + SkFixed drawLine(int y, int stopy, SkFixed fx, SkFixed dx) SK_OVERRIDE { SkASSERT(y < stopy); int16_t runs[3]; uint8_t aa[2]; diff --git a/src/core/SkScan_Path.cpp b/src/core/SkScan_Path.cpp index 84794c63e6..5d9e0ca2a6 100644 --- a/src/core/SkScan_Path.cpp +++ b/src/core/SkScan_Path.cpp @@ -332,7 +332,7 @@ public: } // overrides - virtual void blitH(int x, int y, int width) SK_OVERRIDE { + void blitH(int x, int y, int width) SK_OVERRIDE { int invWidth = x - fPrevX; if (invWidth > 0) { fBlitter->blitH(fPrevX, y, invWidth); @@ -341,19 +341,19 @@ public: } // we do not expect to get called with these entrypoints - virtual void blitAntiH(int, int, const SkAlpha[], const int16_t runs[]) SK_OVERRIDE { + void blitAntiH(int, int, const SkAlpha[], const int16_t runs[]) SK_OVERRIDE { SkDEBUGFAIL("blitAntiH unexpected"); } - virtual void blitV(int x, int y, int height, SkAlpha alpha) SK_OVERRIDE { + void blitV(int x, int y, int height, SkAlpha alpha) SK_OVERRIDE { SkDEBUGFAIL("blitV unexpected"); } - virtual void blitRect(int x, int y, int width, int height) SK_OVERRIDE { + void blitRect(int x, int y, int width, int height) SK_OVERRIDE { SkDEBUGFAIL("blitRect unexpected"); } - virtual void blitMask(const SkMask&, const SkIRect& clip) SK_OVERRIDE { + void blitMask(const SkMask&, const SkIRect& clip) SK_OVERRIDE { SkDEBUGFAIL("blitMask unexpected"); } - virtual const SkBitmap* justAnOpaqueColor(uint32_t* value) SK_OVERRIDE { + const SkBitmap* justAnOpaqueColor(uint32_t* value) SK_OVERRIDE { SkDEBUGFAIL("justAnOpaqueColor unexpected"); return NULL; } diff --git a/src/core/SkSpriteBlitter_ARGB32.cpp b/src/core/SkSpriteBlitter_ARGB32.cpp index 0d0d6d0994..0993a4c7ee 100644 --- a/src/core/SkSpriteBlitter_ARGB32.cpp +++ b/src/core/SkSpriteBlitter_ARGB32.cpp @@ -34,7 +34,7 @@ public: fAlpha = alpha; } - virtual void blitRect(int x, int y, int width, int height) SK_OVERRIDE { + void blitRect(int x, int y, int width, int height) SK_OVERRIDE { SkASSERT(width > 0 && height > 0); uint32_t* SK_RESTRICT dst = fDevice->getAddr32(x, y); const uint32_t* SK_RESTRICT src = fSource->getAddr32(x - fLeft, @@ -122,7 +122,7 @@ public: Sprite_D32_S32A_XferFilter(const SkBitmap& source, const SkPaint& paint) : Sprite_D32_XferFilter(source, paint) {} - virtual void blitRect(int x, int y, int width, int height) SK_OVERRIDE { + void blitRect(int x, int y, int width, int height) SK_OVERRIDE { SkASSERT(width > 0 && height > 0); uint32_t* SK_RESTRICT dst = fDevice->getAddr32(x, y); const uint32_t* SK_RESTRICT src = fSource->getAddr32(x - fLeft, @@ -169,7 +169,7 @@ public: Sprite_D32_S4444_XferFilter(const SkBitmap& source, const SkPaint& paint) : Sprite_D32_XferFilter(source, paint) {} - virtual void blitRect(int x, int y, int width, int height) SK_OVERRIDE { + void blitRect(int x, int y, int width, int height) SK_OVERRIDE { SkASSERT(width > 0 && height > 0); SkPMColor* SK_RESTRICT dst = fDevice->getAddr32(x, y); const SkPMColor16* SK_RESTRICT src = fSource->getAddr16(x - fLeft, @@ -216,7 +216,7 @@ class Sprite_D32_S4444_Opaque : public SkSpriteBlitter { public: Sprite_D32_S4444_Opaque(const SkBitmap& source) : SkSpriteBlitter(source) {} - virtual void blitRect(int x, int y, int width, int height) SK_OVERRIDE { + void blitRect(int x, int y, int width, int height) SK_OVERRIDE { SkASSERT(width > 0 && height > 0); SkPMColor* SK_RESTRICT dst = fDevice->getAddr32(x, y); const SkPMColor16* SK_RESTRICT src = fSource->getAddr16(x - fLeft, @@ -245,7 +245,7 @@ class Sprite_D32_S4444 : public SkSpriteBlitter { public: Sprite_D32_S4444(const SkBitmap& source) : SkSpriteBlitter(source) {} - virtual void blitRect(int x, int y, int width, int height) SK_OVERRIDE { + void blitRect(int x, int y, int width, int height) SK_OVERRIDE { SkASSERT(width > 0 && height > 0); SkPMColor* SK_RESTRICT dst = fDevice->getAddr32(x, y); const SkPMColor16* SK_RESTRICT src = fSource->getAddr16(x - fLeft, diff --git a/src/core/SkSpriteBlitter_RGB16.cpp b/src/core/SkSpriteBlitter_RGB16.cpp index 3ac5127bd7..2f257a0b0e 100644 --- a/src/core/SkSpriteBlitter_RGB16.cpp +++ b/src/core/SkSpriteBlitter_RGB16.cpp @@ -54,7 +54,7 @@ public: : SkSpriteBlitter(source) {} // overrides - virtual void blitRect(int x, int y, int width, int height) SK_OVERRIDE { + void blitRect(int x, int y, int width, int height) SK_OVERRIDE { uint16_t* SK_RESTRICT dst = fDevice->getAddr16(x, y); const uint16_t* SK_RESTRICT src = fSource->getAddr16(x - fLeft, y - fTop); @@ -281,7 +281,7 @@ public: fProc = SkBlitRow::Factory(flags, kRGB_565_SkColorType); } - virtual void blitRect(int x, int y, int width, int height) SK_OVERRIDE { + void blitRect(int x, int y, int width, int height) SK_OVERRIDE { uint16_t* SK_RESTRICT dst = fDevice->getAddr16(x, y); const SkPMColor* SK_RESTRICT src = fSource->getAddr32(x - fLeft, y - fTop); diff --git a/src/core/SkStream.cpp b/src/core/SkStream.cpp index fe6728d7c2..2b190b0e7b 100644 --- a/src/core/SkStream.cpp +++ b/src/core/SkStream.cpp @@ -674,7 +674,7 @@ public: : fBlockMemory(SkRef(headRef)), fCurrent(fBlockMemory->fHead) , fSize(size) , fOffset(0), fCurrentOffset(0) { } - virtual size_t read(void* buffer, size_t rawCount) SK_OVERRIDE { + size_t read(void* buffer, size_t rawCount) SK_OVERRIDE { size_t count = rawCount; if (fOffset + count > fSize) { count = fSize - fOffset; @@ -700,26 +700,26 @@ public: return 0; } - virtual bool isAtEnd() const SK_OVERRIDE { + bool isAtEnd() const SK_OVERRIDE { return fOffset == fSize; } - virtual bool rewind() SK_OVERRIDE { + bool rewind() SK_OVERRIDE { fCurrent = fBlockMemory->fHead; fOffset = 0; fCurrentOffset = 0; return true; } - virtual SkBlockMemoryStream* duplicate() const SK_OVERRIDE { + SkBlockMemoryStream* duplicate() const SK_OVERRIDE { return SkNEW_ARGS(SkBlockMemoryStream, (fBlockMemory.get(), fSize)); } - virtual size_t getPosition() const SK_OVERRIDE { + size_t getPosition() const SK_OVERRIDE { return fOffset; } - virtual bool seek(size_t position) SK_OVERRIDE { + bool seek(size_t position) SK_OVERRIDE { // If possible, skip forward. if (position >= fOffset) { size_t skipAmount = position - fOffset; @@ -736,11 +736,11 @@ public: return this->rewind() && this->skip(position) == position; } - virtual bool move(long offset) SK_OVERRIDE { + bool move(long offset) SK_OVERRIDE { return seek(fOffset + offset); } - virtual SkBlockMemoryStream* fork() const SK_OVERRIDE { + SkBlockMemoryStream* fork() const SK_OVERRIDE { SkAutoTUnref<SkBlockMemoryStream> that(this->duplicate()); that->fCurrent = this->fCurrent; that->fOffset = this->fOffset; @@ -748,11 +748,11 @@ public: return that.detach(); } - virtual size_t getLength() const SK_OVERRIDE { + size_t getLength() const SK_OVERRIDE { return fSize; } - virtual const void* getMemoryBase() SK_OVERRIDE { + const void* getMemoryBase() SK_OVERRIDE { if (NULL == fBlockMemory->fHead->fNext) { return fBlockMemory->fHead->start(); } diff --git a/src/core/SkTypeface.cpp b/src/core/SkTypeface.cpp index 02d2bc89c0..75ff58eea8 100644 --- a/src/core/SkTypeface.cpp +++ b/src/core/SkTypeface.cpp @@ -29,15 +29,15 @@ public: protected: SkEmptyTypeface() : SkTypeface(SkFontStyle(), 0, true) { } - virtual SkStream* onOpenStream(int* ttcIndex) const SK_OVERRIDE { return NULL; } - virtual SkScalerContext* onCreateScalerContext(const SkDescriptor*) const SK_OVERRIDE { + SkStream* onOpenStream(int* ttcIndex) const SK_OVERRIDE { return NULL; } + SkScalerContext* onCreateScalerContext(const SkDescriptor*) const SK_OVERRIDE { return NULL; } - virtual void onFilterRec(SkScalerContextRec*) const SK_OVERRIDE { } + void onFilterRec(SkScalerContextRec*) const SK_OVERRIDE { } virtual SkAdvancedTypefaceMetrics* onGetAdvancedTypefaceMetrics( SkAdvancedTypefaceMetrics::PerGlyphInfo, const uint32_t*, uint32_t) const SK_OVERRIDE { return NULL; } - virtual void onGetFontDescriptor(SkFontDescriptor*, bool*) const SK_OVERRIDE { } + void onGetFontDescriptor(SkFontDescriptor*, bool*) const SK_OVERRIDE { } virtual int onCharsToGlyphs(const void* chars, Encoding encoding, uint16_t glyphs[], int glyphCount) const SK_OVERRIDE { if (glyphs && glyphCount > 0) { @@ -45,20 +45,20 @@ protected: } return 0; } - virtual int onCountGlyphs() const SK_OVERRIDE { return 0; }; - virtual int onGetUPEM() const SK_OVERRIDE { return 0; }; + int onCountGlyphs() const SK_OVERRIDE { return 0; }; + int onGetUPEM() const SK_OVERRIDE { return 0; }; class EmptyLocalizedStrings : public SkTypeface::LocalizedStrings { public: - virtual bool next(SkTypeface::LocalizedString*) SK_OVERRIDE { return false; } + bool next(SkTypeface::LocalizedString*) SK_OVERRIDE { return false; } }; - virtual void onGetFamilyName(SkString* familyName) const SK_OVERRIDE { + void onGetFamilyName(SkString* familyName) const SK_OVERRIDE { familyName->reset(); } - virtual SkTypeface::LocalizedStrings* onCreateFamilyNameIterator() const SK_OVERRIDE { + SkTypeface::LocalizedStrings* onCreateFamilyNameIterator() const SK_OVERRIDE { return SkNEW(EmptyLocalizedStrings); }; - virtual int onGetTableTags(SkFontTableTag tags[]) const SK_OVERRIDE { return 0; } - virtual size_t onGetTableData(SkFontTableTag, size_t, size_t, void*) const SK_OVERRIDE { + int onGetTableTags(SkFontTableTag tags[]) const SK_OVERRIDE { return 0; } + size_t onGetTableData(SkFontTableTag, size_t, size_t, void*) const SK_OVERRIDE { return 0; } }; diff --git a/src/core/SkValidatingReadBuffer.h b/src/core/SkValidatingReadBuffer.h index 5cf3abed68..916bed4d75 100644 --- a/src/core/SkValidatingReadBuffer.h +++ b/src/core/SkValidatingReadBuffer.h @@ -23,48 +23,48 @@ public: SkValidatingReadBuffer(const void* data, size_t size); virtual ~SkValidatingReadBuffer(); - virtual const void* skip(size_t size) SK_OVERRIDE; + const void* skip(size_t size) SK_OVERRIDE; // primitives - virtual bool readBool() SK_OVERRIDE; - virtual SkColor readColor() SK_OVERRIDE; - virtual SkFixed readFixed() SK_OVERRIDE; - virtual int32_t readInt() SK_OVERRIDE; - virtual SkScalar readScalar() SK_OVERRIDE; - virtual uint32_t readUInt() SK_OVERRIDE; - virtual int32_t read32() SK_OVERRIDE; + bool readBool() SK_OVERRIDE; + SkColor readColor() SK_OVERRIDE; + SkFixed readFixed() SK_OVERRIDE; + int32_t readInt() SK_OVERRIDE; + SkScalar readScalar() SK_OVERRIDE; + uint32_t readUInt() SK_OVERRIDE; + int32_t read32() SK_OVERRIDE; // strings -- the caller is responsible for freeing the string contents - virtual void readString(SkString* string) SK_OVERRIDE; - virtual void* readEncodedString(size_t* length, SkPaint::TextEncoding encoding) SK_OVERRIDE; + void readString(SkString* string) SK_OVERRIDE; + void* readEncodedString(size_t* length, SkPaint::TextEncoding encoding) SK_OVERRIDE; // common data structures - virtual SkFlattenable* readFlattenable(SkFlattenable::Type type) SK_OVERRIDE; - virtual void skipFlattenable() SK_OVERRIDE; - virtual void readPoint(SkPoint* point) SK_OVERRIDE; - virtual void readMatrix(SkMatrix* matrix) SK_OVERRIDE; - virtual void readIRect(SkIRect* rect) SK_OVERRIDE; - virtual void readRect(SkRect* rect) SK_OVERRIDE; - virtual void readRegion(SkRegion* region) SK_OVERRIDE; - virtual void readPath(SkPath* path) SK_OVERRIDE; + SkFlattenable* readFlattenable(SkFlattenable::Type type) SK_OVERRIDE; + void skipFlattenable() SK_OVERRIDE; + void readPoint(SkPoint* point) SK_OVERRIDE; + void readMatrix(SkMatrix* matrix) SK_OVERRIDE; + void readIRect(SkIRect* rect) SK_OVERRIDE; + void readRect(SkRect* rect) SK_OVERRIDE; + void readRegion(SkRegion* region) SK_OVERRIDE; + void readPath(SkPath* path) SK_OVERRIDE; // binary data and arrays - virtual bool readByteArray(void* value, size_t size) SK_OVERRIDE; - virtual bool readColorArray(SkColor* colors, size_t size) SK_OVERRIDE; - virtual bool readIntArray(int32_t* values, size_t size) SK_OVERRIDE; - virtual bool readPointArray(SkPoint* points, size_t size) SK_OVERRIDE; - virtual bool readScalarArray(SkScalar* values, size_t size) SK_OVERRIDE; + bool readByteArray(void* value, size_t size) SK_OVERRIDE; + bool readColorArray(SkColor* colors, size_t size) SK_OVERRIDE; + bool readIntArray(int32_t* values, size_t size) SK_OVERRIDE; + bool readPointArray(SkPoint* points, size_t size) SK_OVERRIDE; + bool readScalarArray(SkScalar* values, size_t size) SK_OVERRIDE; // helpers to get info about arrays and binary data - virtual uint32_t getArrayCount() SK_OVERRIDE; + uint32_t getArrayCount() SK_OVERRIDE; // TODO: Implement this (securely) when needed - virtual SkTypeface* readTypeface() SK_OVERRIDE; + SkTypeface* readTypeface() SK_OVERRIDE; - virtual bool validate(bool isValid) SK_OVERRIDE; - virtual bool isValid() const SK_OVERRIDE; + bool validate(bool isValid) SK_OVERRIDE; + bool isValid() const SK_OVERRIDE; - virtual bool validateAvailable(size_t size) SK_OVERRIDE; + bool validateAvailable(size_t size) SK_OVERRIDE; private: bool readArray(void* value, size_t size, size_t elementSize); diff --git a/src/core/SkXfermode.cpp b/src/core/SkXfermode.cpp index d2ba2999f6..dc0dd88402 100644 --- a/src/core/SkXfermode.cpp +++ b/src/core/SkXfermode.cpp @@ -828,11 +828,11 @@ public: GLProcessor::GenKey(*this, caps, b); } - virtual GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE { + GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE { return SkNEW_ARGS(GLProcessor, (*this)); } - virtual const char* name() const SK_OVERRIDE { return "XferEffect"; } + const char* name() const SK_OVERRIDE { return "XferEffect"; } SkXfermode::Mode mode() const { return fMode; } const GrTextureAccess& backgroundAccess() const { return fBackgroundAccess; } @@ -1235,12 +1235,12 @@ private: this->setWillReadDstColor(); } } - virtual bool onIsEqual(const GrFragmentProcessor& other) const SK_OVERRIDE { + bool onIsEqual(const GrFragmentProcessor& other) const SK_OVERRIDE { const XferEffect& s = other.cast<XferEffect>(); return fMode == s.fMode; } - virtual void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE { + void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE { inout->setToUnknown(GrInvariantOutput::kWill_ReadInput); } @@ -1448,8 +1448,8 @@ public: return SkNEW_ARGS(SkClearXfermode, (rec)); } - virtual void xfer32(SkPMColor*, const SkPMColor*, int, const SkAlpha*) const SK_OVERRIDE; - virtual void xferA8(SkAlpha*, const SkPMColor*, int, const SkAlpha*) const SK_OVERRIDE; + void xfer32(SkPMColor*, const SkPMColor*, int, const SkAlpha*) const SK_OVERRIDE; + void xferA8(SkAlpha*, const SkPMColor*, int, const SkAlpha*) const SK_OVERRIDE; SK_TO_STRING_OVERRIDE() @@ -1510,8 +1510,8 @@ public: return SkNEW_ARGS(SkSrcXfermode, (rec)); } - virtual void xfer32(SkPMColor*, const SkPMColor*, int, const SkAlpha*) const SK_OVERRIDE; - virtual void xferA8(SkAlpha*, const SkPMColor*, int, const SkAlpha*) const SK_OVERRIDE; + void xfer32(SkPMColor*, const SkPMColor*, int, const SkAlpha*) const SK_OVERRIDE; + void xferA8(SkAlpha*, const SkPMColor*, int, const SkAlpha*) const SK_OVERRIDE; SK_TO_STRING_OVERRIDE() @@ -1576,7 +1576,7 @@ public: return SkNEW_ARGS(SkDstInXfermode, (rec)); } - virtual void xfer32(SkPMColor*, const SkPMColor*, int, const SkAlpha*) const SK_OVERRIDE; + void xfer32(SkPMColor*, const SkPMColor*, int, const SkAlpha*) const SK_OVERRIDE; SK_TO_STRING_OVERRIDE() @@ -1620,7 +1620,7 @@ public: return SkNEW_ARGS(SkDstOutXfermode, (rec)); } - virtual void xfer32(SkPMColor*, const SkPMColor*, int, const SkAlpha*) const SK_OVERRIDE; + void xfer32(SkPMColor*, const SkPMColor*, int, const SkAlpha*) const SK_OVERRIDE; SK_TO_STRING_OVERRIDE() diff --git a/src/core/SkXfermode_proccoeff.h b/src/core/SkXfermode_proccoeff.h index d7b47046d1..504e64db68 100644 --- a/src/core/SkXfermode_proccoeff.h +++ b/src/core/SkXfermode_proccoeff.h @@ -30,9 +30,9 @@ public: virtual void xferA8(SkAlpha dst[], const SkPMColor src[], int count, const SkAlpha aa[]) const SK_OVERRIDE; - virtual bool asMode(Mode* mode) const SK_OVERRIDE; + bool asMode(Mode* mode) const SK_OVERRIDE; - virtual bool asCoeff(Coeff* sc, Coeff* dc) const SK_OVERRIDE; + bool asCoeff(Coeff* sc, Coeff* dc) const SK_OVERRIDE; #if SK_SUPPORT_GPU virtual bool asFragmentProcessor(GrFragmentProcessor**, @@ -43,7 +43,7 @@ public: SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkProcCoeffXfermode) protected: - virtual void flatten(SkWriteBuffer& buffer) const SK_OVERRIDE; + void flatten(SkWriteBuffer& buffer) const SK_OVERRIDE; Mode getMode() const { return fMode; } |