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/SkCoreBlitters.h | |
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/SkCoreBlitters.h')
-rw-r--r-- | src/core/SkCoreBlitters.h | 26 |
1 files changed, 13 insertions, 13 deletions
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; |