| Index: src/effects/gradients/SkLinearGradient.h
|
| diff --git a/src/effects/gradients/SkLinearGradient.h b/src/effects/gradients/SkLinearGradient.h
|
| index e63a1b8a2ec9c37587fa94d1e3a6ede4ab2ab670..3f4f36f5529b2c85c515b575b06c0a18b48cd58a 100644
|
| --- a/src/effects/gradients/SkLinearGradient.h
|
| +++ b/src/effects/gradients/SkLinearGradient.h
|
| @@ -14,33 +14,33 @@ class SkLinearGradient : public SkGradientShaderBase {
|
| public:
|
| SkLinearGradient(const SkPoint pts[2], const Descriptor&);
|
|
|
| - size_t contextSize() const SK_OVERRIDE;
|
| + size_t contextSize() const override;
|
|
|
| class LinearGradientContext : public SkGradientShaderBase::GradientShaderBaseContext {
|
| public:
|
| LinearGradientContext(const SkLinearGradient&, const ContextRec&);
|
| ~LinearGradientContext() {}
|
|
|
| - void shadeSpan(int x, int y, SkPMColor dstC[], int count) SK_OVERRIDE;
|
| - void shadeSpan16(int x, int y, uint16_t dstC[], int count) SK_OVERRIDE;
|
| + void shadeSpan(int x, int y, SkPMColor dstC[], int count) override;
|
| + void shadeSpan16(int x, int y, uint16_t dstC[], int count) override;
|
|
|
| private:
|
| typedef SkGradientShaderBase::GradientShaderBaseContext INHERITED;
|
| };
|
|
|
| - BitmapType asABitmap(SkBitmap*, SkMatrix*, TileMode*) const SK_OVERRIDE;
|
| - GradientType asAGradient(GradientInfo* info) const SK_OVERRIDE;
|
| + BitmapType asABitmap(SkBitmap*, SkMatrix*, TileMode*) const override;
|
| + GradientType asAGradient(GradientInfo* info) const override;
|
| virtual bool asFragmentProcessor(GrContext*, const SkPaint&, const SkMatrix& viewM,
|
| const SkMatrix*,
|
| - GrColor*, GrFragmentProcessor**) const SK_OVERRIDE;
|
| + GrColor*, GrFragmentProcessor**) const override;
|
|
|
| SK_TO_STRING_OVERRIDE()
|
| SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkLinearGradient)
|
|
|
| protected:
|
| SkLinearGradient(SkReadBuffer& buffer);
|
| - void flatten(SkWriteBuffer& buffer) const SK_OVERRIDE;
|
| - Context* onCreateContext(const ContextRec&, void* storage) const SK_OVERRIDE;
|
| + void flatten(SkWriteBuffer& buffer) const override;
|
| + Context* onCreateContext(const ContextRec&, void* storage) const override;
|
|
|
| private:
|
| friend class SkGradientShader;
|
|
|