Index: src/core/SkCoreBlitters.h |
diff --git a/src/core/SkCoreBlitters.h b/src/core/SkCoreBlitters.h |
index e6be38a583ba524238b35029741a2074664397e9..f4a5d6f4dbbfab199600411adeb5faa977aec22a 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). |
*/ |
- bool resetShaderContext(const SkShader::ContextRec&) SK_OVERRIDE; |
+ bool resetShaderContext(const SkShader::ContextRec&) override; |
- SkShader::Context* getShaderContext() const SK_OVERRIDE { return fShaderContext; } |
+ SkShader::Context* getShaderContext() const 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); |
- 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; |
+ void blitH(int x, int y, int width) override; |
+ void blitAntiH(int x, int y, const SkAlpha antialias[], const int16_t runs[]) override; |
+ void blitV(int x, int y, int height, SkAlpha alpha) override; |
+ void blitRect(int x, int y, int width, int height) override; |
+ void blitMask(const SkMask&, const SkIRect&) override; |
+ const SkBitmap* justAnOpaqueColor(uint32_t*) override; |
}; |
class SkA8_Blitter : public SkRasterBlitter { |
@@ -160,11 +160,11 @@ public: |
SkARGB32_Shader_Blitter(const SkBitmap& device, const SkPaint& paint, |
SkShader::Context* shaderContext); |
virtual ~SkARGB32_Shader_Blitter(); |
- 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; |
+ void blitH(int x, int y, int width) override; |
+ void blitV(int x, int y, int height, SkAlpha alpha) override; |
+ void blitRect(int x, int y, int width, int height) override; |
+ void blitAntiH(int x, int y, const SkAlpha[], const int16_t[]) override; |
+ void blitMask(const SkMask&, const SkIRect&) override; |
private: |
SkXfermode* fXfermode; |