diff options
author | mtklein <mtklein@chromium.org> | 2015-01-09 10:06:39 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-01-09 10:06:40 -0800 |
commit | 72c9faab45124e08c85f70ca38536914862d947c (patch) | |
tree | 611893b84bb33b1592d058ee0f2382f7f86601b8 /src/core/SkBlitter_RGB16.cpp | |
parent | 4490da227f1475fb66af20532c14d6d9febd18b6 (diff) |
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
Diffstat (limited to 'src/core/SkBlitter_RGB16.cpp')
-rw-r--r-- | src/core/SkBlitter_RGB16.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
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; |