| Index: src/animator/SkDrawPaint.h
|
| diff --git a/src/animator/SkDrawPaint.h b/src/animator/SkDrawPaint.h
|
| index e2be340ef266fac95b04133ed4f2a87bb7e869ba..8c29fb3acb97d99d5ecc009217f97d26ddbf787c 100644
|
| --- a/src/animator/SkDrawPaint.h
|
| +++ b/src/animator/SkDrawPaint.h
|
| @@ -27,17 +27,17 @@ class SkDrawPaint : public SkADrawable {
|
| SkDrawPaint();
|
| virtual ~SkDrawPaint();
|
| virtual bool add(SkAnimateMaker* , SkDisplayable* child);
|
| - SkDisplayable* deepCopy(SkAnimateMaker* ) SK_OVERRIDE;
|
| - bool draw(SkAnimateMaker& ) SK_OVERRIDE;
|
| + SkDisplayable* deepCopy(SkAnimateMaker* ) override;
|
| + bool draw(SkAnimateMaker& ) override;
|
| #ifdef SK_DUMP_ENABLED
|
| - void dump(SkAnimateMaker* ) SK_OVERRIDE;
|
| + void dump(SkAnimateMaker* ) override;
|
| #endif
|
| virtual void executeFunction(SkDisplayable* target, int index,
|
| SkTDArray<SkScriptValue>& parameters, SkDisplayTypes type,
|
| - SkScriptValue* ) SK_OVERRIDE;
|
| - const SkFunctionParamType* getFunctionsParameters() SK_OVERRIDE;
|
| - bool getProperty(int index, SkScriptValue* value) const SK_OVERRIDE;
|
| - bool resolveIDs(SkAnimateMaker& maker, SkDisplayable* original, SkApply* apply) SK_OVERRIDE;
|
| + SkScriptValue* ) override;
|
| + const SkFunctionParamType* getFunctionsParameters() override;
|
| + bool getProperty(int index, SkScriptValue* value) const override;
|
| + bool resolveIDs(SkAnimateMaker& maker, SkDisplayable* original, SkApply* apply) override;
|
| protected:
|
| static const SkFunctionParamType fFunctionParameters[];
|
| void setupPaint(SkPaint* paint) const;
|
|
|