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

Unified Diff: src/core/SkCoreBlitters.h

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/SkColorShader.h ('k') | src/core/SkDeviceImageFilterProxy.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/core/SkCoreBlitters.h
diff --git a/src/core/SkCoreBlitters.h b/src/core/SkCoreBlitters.h
index 20f9437ac8a86549304c95eedacfea74eb950739..60211c98b3d552be37acb508f3ea9eac135679d8 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;
« no previous file with comments | « src/core/SkColorShader.h ('k') | src/core/SkDeviceImageFilterProxy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698