diff options
author | 2011-12-07 15:17:50 +0000 | |
---|---|---|
committer | 2011-12-07 15:17:50 +0000 | |
commit | 7716afbb9709da30f98a18bfe95f03574795f4a0 (patch) | |
tree | 966957c08884b640724ae996b9f4afbc4d7c72ac | |
parent | 75d939b549a2cc4c587ce77c4ba7b17582db30ed (diff) |
add SK_OVERRIDEs
git-svn-id: http://skia.googlecode.com/svn/trunk@2820 2bbb7eff-a529-9590-31e7-b0007b416f81
-rw-r--r-- | include/effects/SkTransparentShader.h | 17 | ||||
-rw-r--r-- | src/effects/SkGradientShader.cpp | 56 | ||||
-rw-r--r-- | src/effects/SkTransparentShader.cpp | 8 |
3 files changed, 44 insertions, 37 deletions
diff --git a/include/effects/SkTransparentShader.h b/include/effects/SkTransparentShader.h index ec414c7c1d..e951bba33d 100644 --- a/include/effects/SkTransparentShader.h +++ b/include/effects/SkTransparentShader.h @@ -15,19 +15,18 @@ class SkTransparentShader : public SkShader { public: SkTransparentShader() {} - virtual uint32_t getFlags(); + + virtual uint32_t getFlags() SK_OVERRIDE; virtual bool setContext( const SkBitmap& device, const SkPaint& paint, - const SkMatrix& matrix); - virtual void shadeSpan(int x, int y, SkPMColor[], int count); - virtual void shadeSpan16(int x, int y, uint16_t span[], int count); + const SkMatrix& matrix) SK_OVERRIDE; + virtual void shadeSpan(int x, int y, SkPMColor[], int count) SK_OVERRIDE; + virtual void shadeSpan16(int x, int y, uint16_t span[], int count) SK_OVERRIDE; // overrides for SkFlattenable - virtual Factory getFactory() { return Create; } - virtual void flatten(SkFlattenableWriteBuffer& buffer) { - this->INHERITED::flatten(buffer); - } - + virtual Factory getFactory() SK_OVERRIDE; + virtual void flatten(SkFlattenableWriteBuffer&) SK_OVERRIDE; + private: // these are a cache from the call to setContext() const SkBitmap* fDevice; diff --git a/src/effects/SkGradientShader.cpp b/src/effects/SkGradientShader.cpp index 0ff128bb6e..ded16e71ba 100644 --- a/src/effects/SkGradientShader.cpp +++ b/src/effects/SkGradientShader.cpp @@ -117,8 +117,8 @@ public: virtual ~Gradient_Shader(); // overrides - virtual bool setContext(const SkBitmap&, const SkPaint&, const SkMatrix&); - virtual uint32_t getFlags() { return fFlags; } + virtual bool setContext(const SkBitmap&, const SkPaint&, const SkMatrix&) SK_OVERRIDE; + virtual uint32_t getFlags() SK_OVERRIDE { return fFlags; } protected: Gradient_Shader(SkFlattenableReadBuffer& ); @@ -770,18 +770,18 @@ public: pts_to_unit_matrix(pts, &fPtsToUnit); } - virtual bool setContext(const SkBitmap&, const SkPaint&, const SkMatrix&); - virtual void shadeSpan(int x, int y, SkPMColor dstC[], int count); - virtual void shadeSpan16(int x, int y, uint16_t dstC[], int count); - virtual BitmapType asABitmap(SkBitmap*, SkMatrix*, - TileMode*, SkScalar* twoPointRadialParams) const; - virtual GradientType asAGradient(GradientInfo* info) const; + virtual bool setContext(const SkBitmap&, const SkPaint&, const SkMatrix&) 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; + virtual BitmapType asABitmap(SkBitmap*, SkMatrix*, TileMode*, + SkScalar* twoPointRadialParams) const SK_OVERRIDE; + virtual GradientType asAGradient(GradientInfo* info) const SK_OVERRIDE; static SkFlattenable* CreateProc(SkFlattenableReadBuffer& buffer) { return SkNEW_ARGS(Linear_Gradient, (buffer)); } - virtual void flatten(SkFlattenableWriteBuffer& buffer) { + virtual void flatten(SkFlattenableWriteBuffer& buffer) SK_OVERRIDE { this->INHERITED::flatten(buffer); buffer.writeScalar(fStart.fX); buffer.writeScalar(fStart.fY); @@ -795,7 +795,7 @@ protected: fStart(unflatten_point(buffer)), fEnd(unflatten_point(buffer)) { } - virtual Factory getFactory() { return CreateProc; } + virtual Factory getFactory() SK_OVERRIDE { return CreateProc; } private: typedef Gradient_Shader INHERITED; @@ -1151,8 +1151,8 @@ public: rad_to_unit_matrix(center, radius, &fPtsToUnit); } - virtual void shadeSpan(int x, int y, SkPMColor* SK_RESTRICT dstC, int count); - virtual void shadeSpan16(int x, int y, uint16_t* SK_RESTRICT dstC, int count) { + virtual void shadeSpan(int x, int y, SkPMColor* SK_RESTRICT dstC, int count) SK_OVERRIDE; + virtual void shadeSpan16(int x, int y, uint16_t* SK_RESTRICT dstC, int count) SK_OVERRIDE { SkASSERT(count > 0); SkPoint srcPt; @@ -1256,7 +1256,7 @@ public: virtual BitmapType asABitmap(SkBitmap* bitmap, SkMatrix* matrix, TileMode* xy, - SkScalar* twoPointRadialParams) const { + SkScalar* twoPointRadialParams) const SK_OVERRIDE { if (bitmap) { this->commonAsABitmap(bitmap); } @@ -1270,7 +1270,7 @@ public: } return kRadial_BitmapType; } - virtual GradientType asAGradient(GradientInfo* info) const { + virtual GradientType asAGradient(GradientInfo* info) const SK_OVERRIDE { if (info) { commonAsAGradient(info); info->fPoint[0] = fCenter; @@ -1279,11 +1279,11 @@ public: return kRadial_GradientType; } - static SkFlattenable* CreateProc(SkFlattenableReadBuffer& buffer) { + static SkFlattenable* CreateProc(SkFlattenableReadBuffer& buffer) SK_OVERRIDE { return SkNEW_ARGS(Radial_Gradient, (buffer)); } - virtual void flatten(SkFlattenableWriteBuffer& buffer) { + virtual void flatten(SkFlattenableWriteBuffer& buffer) SK_OVERRIDE { this->INHERITED::flatten(buffer); buffer.writeScalar(fCenter.fX); buffer.writeScalar(fCenter.fY); @@ -1296,7 +1296,7 @@ protected: fCenter(unflatten_point(buffer)), fRadius(buffer.readScalar()) { } - virtual Factory getFactory() { return CreateProc; } + virtual Factory getFactory() SK_OVERRIDE { return CreateProc; } private: typedef Gradient_Shader INHERITED; @@ -1718,7 +1718,7 @@ public: virtual bool setContext(const SkBitmap& device, const SkPaint& paint, const SkMatrix& matrix) { - if (!this->INHERITED::setContext(device, paint, matrix)) { + if (!this->INHERITED::setContext(device, paint, matrix)) SK_OVERRIDE { return false; } @@ -1727,11 +1727,11 @@ public: return true; } - static SkFlattenable* CreateProc(SkFlattenableReadBuffer& buffer) { + static SkFlattenable* CreateProc(SkFlattenableReadBuffer& buffer) SK_OVERRIDE { return SkNEW_ARGS(Two_Point_Radial_Gradient, (buffer)); } - virtual void flatten(SkFlattenableWriteBuffer& buffer) { + virtual void flatten(SkFlattenableWriteBuffer& buffer) SK_OVERRIDE { this->INHERITED::flatten(buffer); buffer.writeScalar(fCenter1.fX); buffer.writeScalar(fCenter1.fY); @@ -1750,7 +1750,7 @@ protected: fRadius2(buffer.readScalar()) { init(); }; - virtual Factory getFactory() { return CreateProc; } + virtual Factory getFactory() SK_OVERRIDE { return CreateProc; } private: typedef Gradient_Shader INHERITED; @@ -1788,13 +1788,13 @@ public: { fPtsToUnit.setTranslate(-cx, -cy); } - virtual void shadeSpan(int x, int y, SkPMColor dstC[], int count); - virtual void shadeSpan16(int x, int y, uint16_t dstC[], int count); + 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; virtual BitmapType asABitmap(SkBitmap* bitmap, SkMatrix* matrix, TileMode* xy, - SkScalar* twoPointRadialParams) const { + SkScalar* twoPointRadialParams) const SK_OVERRIDE { if (bitmap) { this->commonAsABitmap(bitmap); } @@ -1808,7 +1808,7 @@ public: return kSweep_BitmapType; } - virtual GradientType asAGradient(GradientInfo* info) const { + virtual GradientType asAGradient(GradientInfo* info) const SK_OVERRIDE { if (info) { commonAsAGradient(info); info->fPoint[0] = fCenter; @@ -1816,11 +1816,11 @@ public: return kSweep_GradientType; } - static SkFlattenable* CreateProc(SkFlattenableReadBuffer& buffer) { + static SkFlattenable* CreateProc(SkFlattenableReadBuffer& buffer) SK_OVERRIDE { return SkNEW_ARGS(Sweep_Gradient, (buffer)); } - virtual void flatten(SkFlattenableWriteBuffer& buffer) { + virtual void flatten(SkFlattenableWriteBuffer& buffer) SK_OVERRIDE { this->INHERITED::flatten(buffer); buffer.writeScalar(fCenter.fX); buffer.writeScalar(fCenter.fY); @@ -1832,7 +1832,7 @@ protected: fCenter(unflatten_point(buffer)) { } - virtual Factory getFactory() { return CreateProc; } + virtual Factory getFactory() SK_OVERRIDE { return CreateProc; } private: typedef Gradient_Shader INHERITED; diff --git a/src/effects/SkTransparentShader.cpp b/src/effects/SkTransparentShader.cpp index b3ff7088f5..58d7e4469c 100644 --- a/src/effects/SkTransparentShader.cpp +++ b/src/effects/SkTransparentShader.cpp @@ -126,3 +126,11 @@ void SkTransparentShader::shadeSpan16(int x, int y, uint16_t span[], int count) } } +SkFlattenable::Factory SkTransparentShader::getFactory() { + return Create; +} + +void SkTransparentShader::flatten(SkFlattenableWriteBuffer& buffer) { + this->INHERITED::flatten(buffer); +} + |