Index: src/core/SkLocalMatrixShader.h |
diff --git a/src/core/SkLocalMatrixShader.h b/src/core/SkLocalMatrixShader.h |
index be78bee110f8ee6bbbf8a81f460ac4a08fce1e5c..1a469948c6593fc5140001a5c26705d18aa146ed 100644 |
--- a/src/core/SkLocalMatrixShader.h |
+++ b/src/core/SkLocalMatrixShader.h |
@@ -19,16 +19,16 @@ public: |
, fProxyShader(SkRef(proxy)) |
{} |
- size_t contextSize() const SK_OVERRIDE { |
+ size_t contextSize() const override { |
return fProxyShader->contextSize(); |
} |
virtual BitmapType asABitmap(SkBitmap* bitmap, SkMatrix* matrix, |
- TileMode* mode) const SK_OVERRIDE { |
+ TileMode* mode) const override { |
return fProxyShader->asABitmap(bitmap, matrix, mode); |
} |
- GradientType asAGradient(GradientInfo* info) const SK_OVERRIDE { |
+ GradientType asAGradient(GradientInfo* info) const override { |
return fProxyShader->asAGradient(info); |
} |
@@ -36,7 +36,7 @@ public: |
virtual bool asFragmentProcessor(GrContext* context, const SkPaint& paint, |
const SkMatrix& viewM, const SkMatrix* localMatrix, |
- GrColor* grColor, GrFragmentProcessor** fp) const SK_OVERRIDE { |
+ GrColor* grColor, GrFragmentProcessor** fp) const override { |
SkMatrix tmp = this->getLocalMatrix(); |
if (localMatrix) { |
tmp.preConcat(*localMatrix); |
@@ -48,14 +48,14 @@ public: |
virtual bool asFragmentProcessor(GrContext*, const SkPaint&, const SkMatrix&, |
const SkMatrix*, GrColor*, |
- GrFragmentProcessor**) const SK_OVERRIDE { |
+ GrFragmentProcessor**) const override { |
SkDEBUGFAIL("Should not call in GPU-less build"); |
return false; |
} |
#endif |
- SkShader* refAsALocalMatrixShader(SkMatrix* localMatrix) const SK_OVERRIDE { |
+ SkShader* refAsALocalMatrixShader(SkMatrix* localMatrix) const override { |
if (localMatrix) { |
*localMatrix = this->getLocalMatrix(); |
} |
@@ -66,8 +66,8 @@ public: |
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkLocalMatrixShader) |
protected: |
- 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: |
SkAutoTUnref<SkShader> fProxyShader; |