Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(147)

Unified Diff: src/core/SkBlitter_RGB16.cpp

Issue 806653007: Fix up all the easy virtual ... SK_OVERRIDE cases. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: rebase Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/core/SkBlitter.cpp ('k') | src/core/SkBuffer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/core/SkBlitter_RGB16.cpp
diff --git a/src/core/SkBlitter_RGB16.cpp b/src/core/SkBlitter_RGB16.cpp
index f8d663ff2fea078f367680d36828c5bb31ce81f9..7c30fb1ee045bb9195fff36d1d98542b6c3ff9c1 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;
« no previous file with comments | « src/core/SkBlitter.cpp ('k') | src/core/SkBuffer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698