Index: include/core/SkComposeShader.h |
diff --git a/include/core/SkComposeShader.h b/include/core/SkComposeShader.h |
index 8e0d93f7e81bc97790f643d595ddbc2ff2b05dce..dd10447a04880760a59b88d75eac4d7c0fd85480 100644 |
--- a/include/core/SkComposeShader.h |
+++ b/include/core/SkComposeShader.h |
@@ -34,7 +34,7 @@ public: |
SkComposeShader(SkShader* sA, SkShader* sB, SkXfermode* mode = NULL); |
virtual ~SkComposeShader(); |
- size_t contextSize() const SK_OVERRIDE; |
+ size_t contextSize() const override; |
class ComposeShaderContext : public SkShader::Context { |
public: |
@@ -48,7 +48,7 @@ public: |
virtual ~ComposeShaderContext(); |
- void shadeSpan(int x, int y, SkPMColor[], int count) SK_OVERRIDE; |
+ void shadeSpan(int x, int y, SkPMColor[], int count) override; |
private: |
SkShader::Context* fShaderContextA; |
@@ -62,15 +62,15 @@ public: |
SkShader* getShaderB() { return fShaderB; } |
#endif |
- bool asACompose(ComposeRec* rec) const SK_OVERRIDE; |
+ bool asACompose(ComposeRec* rec) const override; |
SK_TO_STRING_OVERRIDE() |
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkComposeShader) |
protected: |
SkComposeShader(SkReadBuffer& ); |
- void flatten(SkWriteBuffer&) const SK_OVERRIDE; |
- Context* onCreateContext(const ContextRec&, void*) const SK_OVERRIDE; |
+ void flatten(SkWriteBuffer&) const override; |
+ Context* onCreateContext(const ContextRec&, void*) const override; |
private: |
SkShader* fShaderA; |