C++11 override should now be supported by all of {bots,Chrome,Android,Mozilla}
NOPRESUBMIT=true
BUG=skia:
DOCS_PREVIEW= https://skia.org/?cl=1037793002
Review URL: https://codereview.chromium.org/1037793002
diff --git a/src/animator/SkAnimate.h b/src/animator/SkAnimate.h
index 225d27d..ee391fc 100644
--- a/src/animator/SkAnimate.h
+++ b/src/animator/SkAnimate.h
@@ -19,11 +19,11 @@
DECLARE_MEMBER_INFO(Animate);
SkAnimate();
virtual ~SkAnimate();
- int components() SK_OVERRIDE;
+ int components() override;
#ifdef SK_DUMP_ENABLED
- void dump(SkAnimateMaker* ) SK_OVERRIDE;
+ void dump(SkAnimateMaker* ) override;
#endif
- void onEndElement(SkAnimateMaker& maker) SK_OVERRIDE;
+ void onEndElement(SkAnimateMaker& maker) override;
protected:
bool resolveCommon(SkAnimateMaker& );
int fComponents;
diff --git a/src/animator/SkAnimateBase.h b/src/animator/SkAnimateBase.h
index 6927297..0da4af1 100644
--- a/src/animator/SkAnimateBase.h
+++ b/src/animator/SkAnimateBase.h
@@ -24,26 +24,26 @@
SkAnimateBase();
virtual ~SkAnimateBase();
virtual int components();
- SkDisplayable* deepCopy(SkAnimateMaker* ) SK_OVERRIDE;
- void dirty() SK_OVERRIDE;
+ SkDisplayable* deepCopy(SkAnimateMaker* ) override;
+ void dirty() override;
#ifdef SK_DUMP_ENABLED
- void dump(SkAnimateMaker* ) SK_OVERRIDE;
+ void dump(SkAnimateMaker* ) override;
#endif
int entries() { return fValues.count() / components(); }
virtual bool hasExecute() const;
bool isDynamic() const { return SkToBool(fDynamic); }
- SkDisplayable* getParent() const SK_OVERRIDE;
- bool getProperty(int index, SkScriptValue* value) const SK_OVERRIDE;
+ SkDisplayable* getParent() const override;
+ bool getProperty(int index, SkScriptValue* value) const override;
SkMSec getStart() const { return fStart; }
SkOperand* getValues() { return fValues.begin(); }
SkDisplayTypes getValuesType() { return fValues.getType(); }
- void onEndElement(SkAnimateMaker& ) SK_OVERRIDE;
+ void onEndElement(SkAnimateMaker& ) override;
void packARGB(SkScalar [], int count, SkTDOperandArray* );
virtual void refresh(SkAnimateMaker& );
void setChanged(bool changed) { fChanged = changed; }
void setHasEndEvent() { fHasEndEvent = true; }
- bool setParent(SkDisplayable* ) SK_OVERRIDE;
- bool setProperty(int index, SkScriptValue& value) SK_OVERRIDE;
+ bool setParent(SkDisplayable* ) override;
+ bool setProperty(int index, SkScriptValue& value) override;
void setTarget(SkAnimateMaker& );
virtual bool targetNeedsInitialization() const;
protected:
diff --git a/src/animator/SkAnimateSet.h b/src/animator/SkAnimateSet.h
index c1ccde3..32a9197 100644
--- a/src/animator/SkAnimateSet.h
+++ b/src/animator/SkAnimateSet.h
@@ -16,10 +16,10 @@
DECLARE_MEMBER_INFO(Set);
SkSet();
#ifdef SK_DUMP_ENABLED
- void dump(SkAnimateMaker* ) SK_OVERRIDE;
+ void dump(SkAnimateMaker* ) override;
#endif
- void onEndElement(SkAnimateMaker& ) SK_OVERRIDE;
- void refresh(SkAnimateMaker& ) SK_OVERRIDE;
+ void onEndElement(SkAnimateMaker& ) override;
+ void refresh(SkAnimateMaker& ) override;
private:
typedef SkAnimate INHERITED;
};
diff --git a/src/animator/SkDisplayAdd.h b/src/animator/SkDisplayAdd.h
index 9e0ff30..c106d86 100644
--- a/src/animator/SkDisplayAdd.h
+++ b/src/animator/SkDisplayAdd.h
@@ -22,15 +22,15 @@
kMode_immediate
};
- 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
- bool enable(SkAnimateMaker& ) SK_OVERRIDE;
- bool hasEnable() const SK_OVERRIDE;
- void initialize() SK_OVERRIDE;
- bool isDrawable() const SK_OVERRIDE;
+ bool enable(SkAnimateMaker& ) override;
+ bool hasEnable() const override;
+ void initialize() override;
+ bool isDrawable() const override;
protected:
// struct _A {
Mode mode;
diff --git a/src/animator/SkDisplayApply.h b/src/animator/SkDisplayApply.h
index 9e7e12f..12cf6ce 100644
--- a/src/animator/SkDisplayApply.h
+++ b/src/animator/SkDisplayApply.h
@@ -38,41 +38,41 @@
void appendActive(SkActive* );
void applyValues(int animatorIndex, SkOperand* values, int count,
SkDisplayTypes , SkMSec time);
- bool contains(SkDisplayable*) SK_OVERRIDE;
+ bool contains(SkDisplayable*) override;
// void createActive(SkAnimateMaker& );
- SkDisplayable* deepCopy(SkAnimateMaker* ) SK_OVERRIDE;
+ SkDisplayable* deepCopy(SkAnimateMaker* ) override;
void disable();
- bool draw(SkAnimateMaker& ) SK_OVERRIDE;
+ bool draw(SkAnimateMaker& ) override;
#ifdef SK_DUMP_ENABLED
- void dump(SkAnimateMaker* ) SK_OVERRIDE;
+ void dump(SkAnimateMaker* ) override;
#endif
- bool enable(SkAnimateMaker& ) SK_OVERRIDE;
+ bool enable(SkAnimateMaker& ) override;
void enableCreate(SkAnimateMaker& );
void enableDynamic(SkAnimateMaker& );
void endSave(int index);
Mode getMode() { return mode; }
- bool getProperty(int index, SkScriptValue* value) const SK_OVERRIDE;
+ bool getProperty(int index, SkScriptValue* value) const override;
SkADrawable* getScope() { return scope; }
void getStep(SkScriptValue* );
SkADrawable* getTarget(SkAnimateBase* );
bool hasDelayedAnimator() const;
- bool hasEnable() const SK_OVERRIDE;
+ bool hasEnable() const override;
bool inactivate(SkAnimateMaker& maker);
- void initialize() SK_OVERRIDE;
+ void initialize() override;
bool interpolate(SkAnimateMaker& , SkMSec time);
- void onEndElement(SkAnimateMaker& ) SK_OVERRIDE;
- const SkMemberInfo* preferredChild(SkDisplayTypes type) SK_OVERRIDE;
+ void onEndElement(SkAnimateMaker& ) override;
+ const SkMemberInfo* preferredChild(SkDisplayTypes type) override;
void refresh(SkAnimateMaker& );
void reset();
- bool resolveIDs(SkAnimateMaker& maker, SkDisplayable* original, SkApply* ) SK_OVERRIDE;
+ bool resolveIDs(SkAnimateMaker& maker, SkDisplayable* original, SkApply* ) override;
bool resolveField(SkAnimateMaker& , SkDisplayable* parent, SkString* str);
void save(int index);
void setEmbedded() { fEmbedded = true; }
- bool setProperty(int index, SkScriptValue& ) SK_OVERRIDE;
- void setSteps(int _steps) SK_OVERRIDE;
+ bool setProperty(int index, SkScriptValue& ) override;
+ void setSteps(int _steps) override;
// virtual void setTime(SkMSec time);
#ifdef SK_DEBUG
- void validate() SK_OVERRIDE;
+ void validate() override;
#endif
private:
SkMSec begin;
diff --git a/src/animator/SkDisplayBounds.h b/src/animator/SkDisplayBounds.h
index 4c21871..547a29e 100644
--- a/src/animator/SkDisplayBounds.h
+++ b/src/animator/SkDisplayBounds.h
@@ -15,7 +15,7 @@
class SkDisplayBounds : public SkDrawRect {
DECLARE_DISPLAY_MEMBER_INFO(Bounds);
SkDisplayBounds();
- bool draw(SkAnimateMaker& ) SK_OVERRIDE;
+ bool draw(SkAnimateMaker& ) override;
private:
SkBool inval;
typedef SkDrawRect INHERITED;
diff --git a/src/animator/SkDisplayEvent.h b/src/animator/SkDisplayEvent.h
index 4da49b9..d223771 100644
--- a/src/animator/SkDisplayEvent.h
+++ b/src/animator/SkDisplayEvent.h
@@ -34,17 +34,17 @@
};
SkDisplayEvent();
virtual ~SkDisplayEvent();
- bool addChild(SkAnimateMaker& , SkDisplayable* child) SK_OVERRIDE;
- bool contains(SkDisplayable*) SK_OVERRIDE;
- SkDisplayable* contains(const SkString& ) SK_OVERRIDE;
+ bool addChild(SkAnimateMaker& , SkDisplayable* child) override;
+ bool contains(SkDisplayable*) override;
+ SkDisplayable* contains(const SkString& ) override;
#ifdef SK_DEBUG
void dumpEvent(SkAnimateMaker* );
#endif
bool enableEvent(SkAnimateMaker& );
- bool getProperty(int index, SkScriptValue* ) const SK_OVERRIDE;
- void onEndElement(SkAnimateMaker& maker) SK_OVERRIDE;
+ bool getProperty(int index, SkScriptValue* ) const override;
+ void onEndElement(SkAnimateMaker& maker) override;
void populateInput(SkAnimateMaker& , const SkEvent& fEvent);
- bool setProperty(int index, SkScriptValue& ) SK_OVERRIDE;
+ bool setProperty(int index, SkScriptValue& ) override;
protected:
SkKey code;
SkBool disable;
diff --git a/src/animator/SkDisplayInclude.h b/src/animator/SkDisplayInclude.h
index 1b6580a..cc87dfa 100644
--- a/src/animator/SkDisplayInclude.h
+++ b/src/animator/SkDisplayInclude.h
@@ -15,9 +15,9 @@
class SkInclude : public SkDisplayable {
DECLARE_MEMBER_INFO(Include);
- void onEndElement(SkAnimateMaker & ) SK_OVERRIDE;
- bool enable(SkAnimateMaker & ) SK_OVERRIDE;
- bool hasEnable() const SK_OVERRIDE;
+ void onEndElement(SkAnimateMaker & ) override;
+ bool enable(SkAnimateMaker & ) override;
+ bool hasEnable() const override;
protected:
SkString src;
};
diff --git a/src/animator/SkDisplayInput.h b/src/animator/SkDisplayInput.h
index 8eba709..b9a1bac 100644
--- a/src/animator/SkDisplayInput.h
+++ b/src/animator/SkDisplayInput.h
@@ -16,10 +16,10 @@
class SkInput : public SkDisplayable {
DECLARE_MEMBER_INFO(Input);
SkInput();
- SkDisplayable* contains(const SkString& ) SK_OVERRIDE;
- bool getProperty(int index, SkScriptValue* value) const SK_OVERRIDE;
- bool enable(SkAnimateMaker & ) SK_OVERRIDE;
- bool hasEnable() const SK_OVERRIDE;
+ SkDisplayable* contains(const SkString& ) override;
+ bool getProperty(int index, SkScriptValue* value) const override;
+ bool enable(SkAnimateMaker & ) override;
+ bool hasEnable() const override;
protected:
SkString name;
int32_t fInt;
diff --git a/src/animator/SkDisplayMath.h b/src/animator/SkDisplayMath.h
index 05c1fe4..4204e26 100644
--- a/src/animator/SkDisplayMath.h
+++ b/src/animator/SkDisplayMath.h
@@ -18,9 +18,9 @@
DECLARE_DISPLAY_MEMBER_INFO(Math);
virtual void executeFunction(SkDisplayable* , int index,
SkTDArray<SkScriptValue>& parameters, SkDisplayTypes type,
- SkScriptValue* ) SK_OVERRIDE;
- const SkFunctionParamType* getFunctionsParameters() SK_OVERRIDE;
- bool getProperty(int index, SkScriptValue* value) const SK_OVERRIDE;
+ SkScriptValue* ) override;
+ const SkFunctionParamType* getFunctionsParameters() override;
+ bool getProperty(int index, SkScriptValue* value) const override;
private:
mutable SkRandom fRandom;
static const SkScalar gConstants[];
diff --git a/src/animator/SkDisplayMovie.h b/src/animator/SkDisplayMovie.h
index c1f184d..76e2d9c 100644
--- a/src/animator/SkDisplayMovie.h
+++ b/src/animator/SkDisplayMovie.h
@@ -21,21 +21,21 @@
SkDisplayMovie();
virtual ~SkDisplayMovie();
void buildMovie();
- SkDisplayable* deepCopy(SkAnimateMaker* ) SK_OVERRIDE;
- void dirty() SK_OVERRIDE;
+ SkDisplayable* deepCopy(SkAnimateMaker* ) override;
+ void dirty() override;
bool doEvent(const SkEvent& evt) {
return fLoaded && fMovie.doEvent(evt);
}
- bool doEvent(SkDisplayEvent::Kind , SkEventState* state ) SK_OVERRIDE;
- bool draw(SkAnimateMaker& ) SK_OVERRIDE;
+ bool doEvent(SkDisplayEvent::Kind , SkEventState* state ) override;
+ bool draw(SkAnimateMaker& ) override;
#ifdef SK_DUMP_ENABLED
- void dump(SkAnimateMaker* ) SK_OVERRIDE;
- void dumpEvents() SK_OVERRIDE;
+ void dump(SkAnimateMaker* ) override;
+ void dumpEvents() override;
#endif
- bool enable(SkAnimateMaker& ) SK_OVERRIDE;
+ bool enable(SkAnimateMaker& ) override;
const SkAnimator* getAnimator() const { return &fMovie; }
- bool hasEnable() const SK_OVERRIDE;
- void onEndElement(SkAnimateMaker& ) SK_OVERRIDE;
+ bool hasEnable() const override;
+ void onEndElement(SkAnimateMaker& ) override;
protected:
SkString src;
SkAnimator fMovie;
diff --git a/src/animator/SkDisplayNumber.h b/src/animator/SkDisplayNumber.h
index 92f0fa3..b92c311 100644
--- a/src/animator/SkDisplayNumber.h
+++ b/src/animator/SkDisplayNumber.h
@@ -15,7 +15,7 @@
class SkDisplayNumber : public SkDisplayable {
DECLARE_DISPLAY_MEMBER_INFO(Number);
- bool getProperty(int index, SkScriptValue* value) const SK_OVERRIDE;
+ bool getProperty(int index, SkScriptValue* value) const override;
private:
};
diff --git a/src/animator/SkDisplayPost.h b/src/animator/SkDisplayPost.h
index c6c4b51..80fdcfc 100644
--- a/src/animator/SkDisplayPost.h
+++ b/src/animator/SkDisplayPost.h
@@ -27,17 +27,17 @@
};
SkPost();
virtual ~SkPost();
- bool addChild(SkAnimateMaker& , SkDisplayable* child) SK_OVERRIDE;
- bool childrenNeedDisposing() const SK_OVERRIDE;
- void dirty() SK_OVERRIDE;
+ bool addChild(SkAnimateMaker& , SkDisplayable* child) override;
+ bool childrenNeedDisposing() const override;
+ void dirty() override;
#ifdef SK_DUMP_ENABLED
- void dump(SkAnimateMaker* ) SK_OVERRIDE;
+ void dump(SkAnimateMaker* ) override;
#endif
- bool enable(SkAnimateMaker& ) SK_OVERRIDE;
- bool hasEnable() const SK_OVERRIDE;
- void onEndElement(SkAnimateMaker& ) SK_OVERRIDE;
- void setChildHasID() SK_OVERRIDE;
- bool setProperty(int index, SkScriptValue& ) SK_OVERRIDE;
+ bool enable(SkAnimateMaker& ) override;
+ bool hasEnable() const override;
+ void onEndElement(SkAnimateMaker& ) override;
+ void setChildHasID() override;
+ bool setProperty(int index, SkScriptValue& ) override;
protected:
SkMSec delay;
SkString sink;
diff --git a/src/animator/SkDisplayRandom.h b/src/animator/SkDisplayRandom.h
index 6a04f59..2999156 100644
--- a/src/animator/SkDisplayRandom.h
+++ b/src/animator/SkDisplayRandom.h
@@ -26,10 +26,10 @@
DECLARE_DISPLAY_MEMBER_INFO(Random);
SkDisplayRandom();
#ifdef SK_DUMP_ENABLED
- void dump(SkAnimateMaker* ) SK_OVERRIDE;
+ void dump(SkAnimateMaker* ) override;
#endif
- bool getProperty(int index, SkScriptValue* value) const SK_OVERRIDE;
- bool setProperty(int index, SkScriptValue& ) SK_OVERRIDE;
+ bool getProperty(int index, SkScriptValue* value) const override;
+ bool setProperty(int index, SkScriptValue& ) override;
private:
SkScalar blend;
SkScalar min;
diff --git a/src/animator/SkDisplayTypes.h b/src/animator/SkDisplayTypes.h
index a9432da..d1c937f 100644
--- a/src/animator/SkDisplayTypes.h
+++ b/src/animator/SkDisplayTypes.h
@@ -34,7 +34,7 @@
DECLARE_DISPLAY_MEMBER_INFO(Boolean);
SkDisplayBoolean();
#ifdef SK_DUMP_ENABLED
- void dump(SkAnimateMaker* ) SK_OVERRIDE;
+ void dump(SkAnimateMaker* ) override;
#endif
SkBool value;
friend class SkAnimatorScript;
@@ -47,7 +47,7 @@
DECLARE_DISPLAY_MEMBER_INFO(Int);
SkDisplayInt();
#ifdef SK_DUMP_ENABLED
- void dump(SkAnimateMaker* ) SK_OVERRIDE;
+ void dump(SkAnimateMaker* ) override;
#endif
private:
int32_t value;
@@ -61,7 +61,7 @@
DECLARE_DISPLAY_MEMBER_INFO(Float);
SkDisplayFloat();
#ifdef SK_DUMP_ENABLED
- void dump(SkAnimateMaker* ) SK_OVERRIDE;
+ void dump(SkAnimateMaker* ) override;
#endif
private:
SkScalar value;
@@ -77,9 +77,9 @@
SkDisplayString(SkString& );
virtual void executeFunction(SkDisplayable* , int index,
SkTDArray<SkScriptValue>& parameters, SkDisplayTypes type,
- SkScriptValue* ) SK_OVERRIDE;
- const SkFunctionParamType* getFunctionsParameters() SK_OVERRIDE;
- bool getProperty(int index, SkScriptValue* ) const SK_OVERRIDE;
+ SkScriptValue* ) override;
+ const SkFunctionParamType* getFunctionsParameters() override;
+ bool getProperty(int index, SkScriptValue* ) const override;
SkString value;
private:
static const SkFunctionParamType fFunctionParameters[];
@@ -91,7 +91,7 @@
SkDisplayArray(SkTypedArray& );
SkDisplayArray(SkOpArray& ); // compiled script experiment
virtual ~SkDisplayArray();
- bool getProperty(int index, SkScriptValue* ) const SK_OVERRIDE;
+ bool getProperty(int index, SkScriptValue* ) const override;
private:
SkTypedArray values;
friend class SkAnimator;
diff --git a/src/animator/SkDraw3D.h b/src/animator/SkDraw3D.h
index 5f066ba..e30dc11 100644
--- a/src/animator/SkDraw3D.h
+++ b/src/animator/SkDraw3D.h
@@ -27,7 +27,7 @@
DECLARE_MEMBER_INFO(3D_Camera);
Sk3D_Camera();
virtual ~Sk3D_Camera();
- bool draw(SkAnimateMaker& ) SK_OVERRIDE;
+ bool draw(SkAnimateMaker& ) override;
private:
SkScalar hackWidth;
SkScalar hackHeight;
@@ -40,8 +40,8 @@
private:
virtual void executeFunction(SkDisplayable* , int index,
SkTDArray<SkScriptValue>& parameters, SkDisplayTypes type,
- SkScriptValue* ) SK_OVERRIDE;
- const SkFunctionParamType* getFunctionsParameters() SK_OVERRIDE;
+ SkScriptValue* ) override;
+ const SkFunctionParamType* getFunctionsParameters() override;
SkPatch3D fPatch;
static const SkFunctionParamType fFunctionParameters[];
friend class Sk3D_Camera;
diff --git a/src/animator/SkDrawBitmap.h b/src/animator/SkDrawBitmap.h
index a1b74b6..270545d 100644
--- a/src/animator/SkDrawBitmap.h
+++ b/src/animator/SkDrawBitmap.h
@@ -20,7 +20,7 @@
DECLARE_MEMBER_INFO(BaseBitmap);
SkBaseBitmap();
virtual ~SkBaseBitmap();
- bool draw(SkAnimateMaker& ) SK_OVERRIDE;
+ bool draw(SkAnimateMaker& ) override;
protected:
SkBitmap fBitmap;
SkScalar x;
@@ -36,10 +36,10 @@
SkDrawBitmap();
virtual ~SkDrawBitmap();
#ifdef SK_DUMP_ENABLED
- void dump(SkAnimateMaker* ) SK_OVERRIDE;
+ void dump(SkAnimateMaker* ) override;
#endif
- void onEndElement(SkAnimateMaker& ) SK_OVERRIDE;
- bool setProperty(int index, SkScriptValue& value) SK_OVERRIDE;
+ void onEndElement(SkAnimateMaker& ) override;
+ bool setProperty(int index, SkScriptValue& value) override;
protected:
int /*SkBitmap::Config*/ format;
int32_t height;
@@ -54,11 +54,11 @@
DECLARE_MEMBER_INFO(ImageBaseBitmap);
SkImageBaseBitmap();
virtual ~SkImageBaseBitmap();
- SkDisplayable* deepCopy(SkAnimateMaker* ) SK_OVERRIDE;
- void dirty() SK_OVERRIDE;
- bool draw(SkAnimateMaker& ) SK_OVERRIDE;
- bool getProperty(int index, SkScriptValue* value) const SK_OVERRIDE;
- void onEndElement(SkAnimateMaker& maker) SK_OVERRIDE;
+ SkDisplayable* deepCopy(SkAnimateMaker* ) override;
+ void dirty() override;
+ bool draw(SkAnimateMaker& ) override;
+ bool getProperty(int index, SkScriptValue* value) const override;
+ void onEndElement(SkAnimateMaker& maker) override;
private:
void resolve() const { (const_cast<SkImageBaseBitmap*>(this))->resolve(); }
void resolve();
diff --git a/src/animator/SkDrawBlur.h b/src/animator/SkDrawBlur.h
index 56f29db..d3a528c 100644
--- a/src/animator/SkDrawBlur.h
+++ b/src/animator/SkDrawBlur.h
@@ -14,7 +14,7 @@
class SkDrawBlur : public SkDrawMaskFilter {
DECLARE_DRAW_MEMBER_INFO(Blur);
SkDrawBlur();
- SkMaskFilter* getMaskFilter() SK_OVERRIDE;
+ SkMaskFilter* getMaskFilter() override;
protected:
SkScalar fSigma;
int /*SkBlurStyle*/ fBlurStyle;
diff --git a/src/animator/SkDrawClip.h b/src/animator/SkDrawClip.h
index 54c8651..6c64f93 100644
--- a/src/animator/SkDrawClip.h
+++ b/src/animator/SkDrawClip.h
@@ -20,7 +20,7 @@
class SkDrawClip : public SkADrawable {
DECLARE_DRAW_MEMBER_INFO(Clip);
SkDrawClip();
- bool draw(SkAnimateMaker& ) SK_OVERRIDE;
+ bool draw(SkAnimateMaker& ) override;
private:
SkDrawRect* rect;
SkDrawPath* path;
diff --git a/src/animator/SkDrawColor.h b/src/animator/SkDrawColor.h
index b5b4f2d..14788e4 100644
--- a/src/animator/SkDrawColor.h
+++ b/src/animator/SkDrawColor.h
@@ -14,18 +14,18 @@
class SkDrawColor : public SkPaintPart {
DECLARE_DRAW_MEMBER_INFO(Color);
SkDrawColor();
- bool add() SK_OVERRIDE;
- void dirty() SK_OVERRIDE;
+ bool add() override;
+ void dirty() override;
#ifdef SK_DUMP_ENABLED
- void dump(SkAnimateMaker* ) SK_OVERRIDE;
+ void dump(SkAnimateMaker* ) override;
#endif
SkColor getColor();
- SkDisplayable* deepCopy(SkAnimateMaker* ) SK_OVERRIDE;
- SkDisplayable* getParent() const SK_OVERRIDE;
- bool getProperty(int index, SkScriptValue* value) const SK_OVERRIDE;
- void onEndElement(SkAnimateMaker& ) SK_OVERRIDE;
- bool setParent(SkDisplayable* parent) SK_OVERRIDE;
- bool setProperty(int index, SkScriptValue&) SK_OVERRIDE;
+ SkDisplayable* deepCopy(SkAnimateMaker* ) override;
+ SkDisplayable* getParent() const override;
+ bool getProperty(int index, SkScriptValue* value) const override;
+ void onEndElement(SkAnimateMaker& ) override;
+ bool setParent(SkDisplayable* parent) override;
+ bool setProperty(int index, SkScriptValue&) override;
protected:
SkColor color;
SkScalar fHue;
diff --git a/src/animator/SkDrawDash.h b/src/animator/SkDrawDash.h
index fa020c2..3083fe8 100644
--- a/src/animator/SkDrawDash.h
+++ b/src/animator/SkDrawDash.h
@@ -15,7 +15,7 @@
DECLARE_MEMBER_INFO(Dash);
SkDash();
virtual ~SkDash();
- SkPathEffect* getPathEffect() SK_OVERRIDE;
+ SkPathEffect* getPathEffect() override;
private:
SkTDScalarArray intervals;
SkScalar phase;
diff --git a/src/animator/SkDrawDiscrete.h b/src/animator/SkDrawDiscrete.h
index ea44199..fe13f26 100644
--- a/src/animator/SkDrawDiscrete.h
+++ b/src/animator/SkDrawDiscrete.h
@@ -13,7 +13,7 @@
class SkDiscrete : public SkDrawPathEffect {
DECLARE_MEMBER_INFO(Discrete);
SkDiscrete();
- SkPathEffect* getPathEffect() SK_OVERRIDE;
+ SkPathEffect* getPathEffect() override;
private:
SkScalar deviation;
SkScalar segLength;
diff --git a/src/animator/SkDrawEmboss.h b/src/animator/SkDrawEmboss.h
index 6ffe207..941be61 100644
--- a/src/animator/SkDrawEmboss.h
+++ b/src/animator/SkDrawEmboss.h
@@ -15,7 +15,7 @@
class SkDrawEmboss : public SkDrawMaskFilter {
DECLARE_DRAW_MEMBER_INFO(Emboss);
SkDrawEmboss();
- SkMaskFilter* getMaskFilter() SK_OVERRIDE;
+ SkMaskFilter* getMaskFilter() override;
protected:
SkTDScalarArray fDirection;
SkScalar fSigma;
diff --git a/src/animator/SkDrawExtraPathEffect.cpp b/src/animator/SkDrawExtraPathEffect.cpp
index b13429e..68b5006 100644
--- a/src/animator/SkDrawExtraPathEffect.cpp
+++ b/src/animator/SkDrawExtraPathEffect.cpp
@@ -20,8 +20,8 @@
DECLARE_PRIVATE_MEMBER_INFO(DrawShapePathEffect);
SkDrawShapePathEffect();
virtual ~SkDrawShapePathEffect();
- bool addChild(SkAnimateMaker& , SkDisplayable* ) SK_OVERRIDE;
- SkPathEffect* getPathEffect() SK_OVERRIDE;
+ bool addChild(SkAnimateMaker& , SkDisplayable* ) override;
+ SkPathEffect* getPathEffect() override;
protected:
SkADrawable* addPath;
SkADrawable* addMatrix;
@@ -35,7 +35,7 @@
DECLARE_EXTRAS_MEMBER_INFO(SkDrawShape1DPathEffect);
SkDrawShape1DPathEffect(SkDisplayTypes );
virtual ~SkDrawShape1DPathEffect();
- void onEndElement(SkAnimateMaker& ) SK_OVERRIDE;
+ void onEndElement(SkAnimateMaker& ) override;
private:
SkString phase;
SkString spacing;
@@ -47,7 +47,7 @@
DECLARE_EXTRAS_MEMBER_INFO(SkDrawShape2DPathEffect);
SkDrawShape2DPathEffect(SkDisplayTypes );
virtual ~SkDrawShape2DPathEffect();
- void onEndElement(SkAnimateMaker& ) SK_OVERRIDE;
+ void onEndElement(SkAnimateMaker& ) override;
private:
SkDrawMatrix* matrix;
friend class SkShape2DPathEffect;
@@ -58,9 +58,9 @@
DECLARE_EXTRAS_MEMBER_INFO(SkDrawComposePathEffect);
SkDrawComposePathEffect(SkDisplayTypes );
virtual ~SkDrawComposePathEffect();
- bool addChild(SkAnimateMaker& , SkDisplayable* ) SK_OVERRIDE;
- SkPathEffect* getPathEffect() SK_OVERRIDE;
- bool isPaint() const SK_OVERRIDE;
+ bool addChild(SkAnimateMaker& , SkDisplayable* ) override;
+ SkPathEffect* getPathEffect() override;
+ bool isPaint() const override;
private:
SkDrawPathEffect* effect1;
SkDrawPathEffect* effect2;
@@ -70,7 +70,7 @@
DECLARE_EXTRAS_MEMBER_INFO(SkDrawCornerPathEffect);
SkDrawCornerPathEffect(SkDisplayTypes );
virtual ~SkDrawCornerPathEffect();
- SkPathEffect* getPathEffect() SK_OVERRIDE;
+ SkPathEffect* getPathEffect() override;
private:
SkScalar radius;
};
@@ -90,10 +90,10 @@
}
// For serialization. This will never be called.
- Factory getFactory() const SK_OVERRIDE { sk_throw(); return NULL; }
+ Factory getFactory() const override { sk_throw(); return NULL; }
protected:
- SkScalar begin(SkScalar contourLength) const SK_OVERRIDE {
+ SkScalar begin(SkScalar contourLength) const override {
SkScriptValue value;
SkAnimatorScript engine(*fMaker, NULL, SkType_Float);
engine.propertyCallBack(GetContourLength, &contourLength);
@@ -102,7 +102,7 @@
return value.fOperand.fScalar;
}
- SkScalar next(SkPath* dst, SkScalar distance, SkPathMeasure&) const SK_OVERRIDE {
+ SkScalar next(SkPath* dst, SkScalar distance, SkPathMeasure&) const override {
fMaker->setExtraPropertyCallBack(fDraw->fType, GetDistance, &distance);
SkDrawPath* drawPath = NULL;
if (fDraw->addPath->isPath()) {
@@ -140,7 +140,7 @@
}
#ifndef SK_IGNORE_TO_STRING
- void toString(SkString* str) const SK_OVERRIDE {
+ void toString(SkString* str) const override {
str->appendf("SkShape1DPathEffect: (");
// TODO: fill in
str->appendf(")");
@@ -238,14 +238,14 @@
}
// For serialization. This will never be called.
- Factory getFactory() const SK_OVERRIDE { sk_throw(); return NULL; }
+ Factory getFactory() const override { sk_throw(); return NULL; }
protected:
- void begin(const SkIRect& uvBounds, SkPath*) const SK_OVERRIDE {
+ void begin(const SkIRect& uvBounds, SkPath*) const override {
const_cast<SkShape2DPathEffect*>(this)->setUVBounds(uvBounds);
}
- void next(const SkPoint& loc, int u, int v, SkPath* dst) const SK_OVERRIDE {
+ void next(const SkPoint& loc, int u, int v, SkPath* dst) const override {
const_cast<SkShape2DPathEffect*>(this)->addPath(loc, u, v, dst);
}
diff --git a/src/animator/SkDrawFull.h b/src/animator/SkDrawFull.h
index 029fb33..8a79c4d 100644
--- a/src/animator/SkDrawFull.h
+++ b/src/animator/SkDrawFull.h
@@ -14,7 +14,7 @@
class SkFull : public SkBoundable {
DECLARE_EMPTY_MEMBER_INFO(Full);
- bool draw(SkAnimateMaker& ) SK_OVERRIDE;
+ bool draw(SkAnimateMaker& ) override;
private:
typedef SkBoundable INHERITED;
};
diff --git a/src/animator/SkDrawGradient.h b/src/animator/SkDrawGradient.h
index d6dd144..87df376 100644
--- a/src/animator/SkDrawGradient.h
+++ b/src/animator/SkDrawGradient.h
@@ -18,11 +18,11 @@
DECLARE_PRIVATE_MEMBER_INFO(DrawGradient);
SkDrawGradient();
virtual ~SkDrawGradient();
- bool addChild(SkAnimateMaker& , SkDisplayable* child) SK_OVERRIDE;
+ bool addChild(SkAnimateMaker& , SkDisplayable* child) override;
#ifdef SK_DUMP_ENABLED
virtual void dumpRest(SkAnimateMaker*);
#endif
- void onEndElement(SkAnimateMaker& ) SK_OVERRIDE;
+ void onEndElement(SkAnimateMaker& ) override;
protected:
SkTDScalarArray offsets;
SkString unitMapper;
@@ -36,11 +36,11 @@
class SkDrawLinearGradient : public SkDrawGradient {
DECLARE_MEMBER_INFO(DrawLinearGradient);
SkDrawLinearGradient();
- void onEndElement(SkAnimateMaker& ) SK_OVERRIDE;
+ void onEndElement(SkAnimateMaker& ) override;
#ifdef SK_DUMP_ENABLED
- void dump(SkAnimateMaker*) SK_OVERRIDE;
+ void dump(SkAnimateMaker*) override;
#endif
- SkShader* getShader() SK_OVERRIDE;
+ SkShader* getShader() override;
protected:
SkTDScalarArray points;
private:
@@ -51,9 +51,9 @@
DECLARE_MEMBER_INFO(DrawRadialGradient);
SkDrawRadialGradient();
#ifdef SK_DUMP_ENABLED
- void dump(SkAnimateMaker*) SK_OVERRIDE;
+ void dump(SkAnimateMaker*) override;
#endif
- SkShader* getShader() SK_OVERRIDE;
+ SkShader* getShader() override;
protected:
SkPoint center;
SkScalar radius;
diff --git a/src/animator/SkDrawGroup.h b/src/animator/SkDrawGroup.h
index 5d33dfe..83e6771 100644
--- a/src/animator/SkDrawGroup.h
+++ b/src/animator/SkDrawGroup.h
@@ -19,35 +19,35 @@
DECLARE_MEMBER_INFO(Group);
SkGroup();
virtual ~SkGroup();
- bool addChild(SkAnimateMaker& , SkDisplayable* child) SK_OVERRIDE;
- bool contains(SkDisplayable* ) SK_OVERRIDE;
+ bool addChild(SkAnimateMaker& , SkDisplayable* child) override;
+ bool contains(SkDisplayable* ) override;
SkGroup* copy();
SkBool copySet(int index);
- SkDisplayable* deepCopy(SkAnimateMaker* ) SK_OVERRIDE;
- bool doEvent(SkDisplayEvent::Kind , SkEventState* state ) SK_OVERRIDE;
- bool draw(SkAnimateMaker& ) SK_OVERRIDE;
+ SkDisplayable* deepCopy(SkAnimateMaker* ) override;
+ bool doEvent(SkDisplayEvent::Kind , SkEventState* state ) override;
+ bool draw(SkAnimateMaker& ) override;
#ifdef SK_DUMP_ENABLED
- void dump(SkAnimateMaker* ) SK_OVERRIDE;
+ void dump(SkAnimateMaker* ) override;
virtual void dumpDrawables(SkAnimateMaker* );
- void dumpEvents() SK_OVERRIDE;
+ void dumpEvents() override;
#endif
int findGroup(SkADrawable* drawable, SkTDDrawableArray** list,
SkGroup** parent, SkGroup** found, SkTDDrawableArray** grandList);
- bool enable(SkAnimateMaker& ) SK_OVERRIDE;
+ bool enable(SkAnimateMaker& ) override;
SkTDDrawableArray* getChildren() { return &fChildren; }
SkGroup* getOriginal() { return fOriginal; }
- bool hasEnable() const SK_OVERRIDE;
- void initialize() SK_OVERRIDE;
+ bool hasEnable() const override;
+ void initialize() override;
SkBool isACopy() { return fOriginal != NULL; }
void markCopyClear(int index);
void markCopySet(int index);
void markCopySize(int index);
bool markedForDelete(int index) const { return (fCopies[index >> 5] & 1 << (index & 0x1f)) == 0; }
void reset();
- bool resolveIDs(SkAnimateMaker& maker, SkDisplayable* original, SkApply* ) SK_OVERRIDE;
- void setSteps(int steps) SK_OVERRIDE;
+ bool resolveIDs(SkAnimateMaker& maker, SkDisplayable* original, SkApply* ) override;
+ void setSteps(int steps) override;
#ifdef SK_DEBUG
- void validate() SK_OVERRIDE;
+ void validate() override;
#endif
protected:
bool ifCondition(SkAnimateMaker& maker, SkADrawable* drawable,
@@ -64,7 +64,7 @@
class SkSave: public SkGroup {
DECLARE_MEMBER_INFO(Save);
- bool draw(SkAnimateMaker& ) SK_OVERRIDE;
+ bool draw(SkAnimateMaker& ) override;
private:
typedef SkGroup INHERITED;
};
diff --git a/src/animator/SkDrawLine.h b/src/animator/SkDrawLine.h
index 7367aab..996964a 100644
--- a/src/animator/SkDrawLine.h
+++ b/src/animator/SkDrawLine.h
@@ -16,7 +16,7 @@
class SkLine : public SkBoundable {
DECLARE_MEMBER_INFO(Line);
SkLine();
- bool draw(SkAnimateMaker& ) SK_OVERRIDE;
+ bool draw(SkAnimateMaker& ) override;
private:
SkScalar x1;
SkScalar x2;
diff --git a/src/animator/SkDrawMatrix.h b/src/animator/SkDrawMatrix.h
index d5e19a5..df17a9b 100644
--- a/src/animator/SkDrawMatrix.h
+++ b/src/animator/SkDrawMatrix.h
@@ -21,25 +21,25 @@
DECLARE_DRAW_MEMBER_INFO(Matrix);
SkDrawMatrix();
virtual ~SkDrawMatrix();
- bool addChild(SkAnimateMaker& , SkDisplayable* child) SK_OVERRIDE;
- bool childrenNeedDisposing() const SK_OVERRIDE;
- void dirty() SK_OVERRIDE;
- bool draw(SkAnimateMaker& ) SK_OVERRIDE;
+ bool addChild(SkAnimateMaker& , SkDisplayable* child) override;
+ bool childrenNeedDisposing() const override;
+ void dirty() override;
+ bool draw(SkAnimateMaker& ) override;
#ifdef SK_DUMP_ENABLED
- void dump(SkAnimateMaker* ) SK_OVERRIDE;
+ void dump(SkAnimateMaker* ) override;
#endif
SkMatrix& getMatrix();
- bool getProperty(int index, SkScriptValue* value) const SK_OVERRIDE;
- void initialize() SK_OVERRIDE;
- void onEndElement(SkAnimateMaker& ) SK_OVERRIDE;
- void setChildHasID() SK_OVERRIDE;
- bool setProperty(int index, SkScriptValue& ) SK_OVERRIDE;
+ bool getProperty(int index, SkScriptValue* value) const override;
+ void initialize() override;
+ void onEndElement(SkAnimateMaker& ) override;
+ void setChildHasID() override;
+ bool setProperty(int index, SkScriptValue& ) override;
void concat(SkMatrix& inMatrix) {
fConcat.preConcat(inMatrix);
}
- SkDisplayable* deepCopy(SkAnimateMaker* ) SK_OVERRIDE;
+ SkDisplayable* deepCopy(SkAnimateMaker* ) override;
void rotate(SkScalar degrees, SkPoint& center) {
diff --git a/src/animator/SkDrawOval.h b/src/animator/SkDrawOval.h
index 03b0270..e4d4712 100644
--- a/src/animator/SkDrawOval.h
+++ b/src/animator/SkDrawOval.h
@@ -14,7 +14,7 @@
class SkOval : public SkDrawRect {
DECLARE_MEMBER_INFO(Oval);
- bool draw(SkAnimateMaker& ) SK_OVERRIDE;
+ bool draw(SkAnimateMaker& ) override;
private:
typedef SkDrawRect INHERITED;
};
diff --git a/src/animator/SkDrawPaint.h b/src/animator/SkDrawPaint.h
index e2be340..8c29fb3 100644
--- a/src/animator/SkDrawPaint.h
+++ b/src/animator/SkDrawPaint.h
@@ -27,17 +27,17 @@
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;
diff --git a/src/animator/SkDrawPath.h b/src/animator/SkDrawPath.h
index d64195b..81978fb 100644
--- a/src/animator/SkDrawPath.h
+++ b/src/animator/SkDrawPath.h
@@ -19,22 +19,22 @@
DECLARE_DRAW_MEMBER_INFO(Path);
SkDrawPath();
virtual ~SkDrawPath();
- bool addChild(SkAnimateMaker& , SkDisplayable* child) SK_OVERRIDE;
+ bool addChild(SkAnimateMaker& , SkDisplayable* child) override;
bool childHasID() { return SkToBool(fChildHasID); }
- bool childrenNeedDisposing() const SK_OVERRIDE;
- void dirty() SK_OVERRIDE;
- bool draw(SkAnimateMaker& ) SK_OVERRIDE;
- SkDisplayable* getParent() const SK_OVERRIDE;
+ bool childrenNeedDisposing() const override;
+ void dirty() override;
+ bool draw(SkAnimateMaker& ) override;
+ SkDisplayable* getParent() const override;
#ifdef SK_DUMP_ENABLED
- void dump(SkAnimateMaker* ) SK_OVERRIDE;
+ void dump(SkAnimateMaker* ) override;
#endif
SkPath& getPath();
- bool getProperty(int index, SkScriptValue* value) const SK_OVERRIDE;
- bool setProperty(int index, SkScriptValue& value) SK_OVERRIDE;
- void onEndElement(SkAnimateMaker& ) SK_OVERRIDE;
- void setChildHasID() SK_OVERRIDE;
- bool setParent(SkDisplayable* parent) SK_OVERRIDE;
- bool isPath() const SK_OVERRIDE { return true; }
+ bool getProperty(int index, SkScriptValue* value) const override;
+ bool setProperty(int index, SkScriptValue& value) override;
+ void onEndElement(SkAnimateMaker& ) override;
+ void setChildHasID() override;
+ bool setParent(SkDisplayable* parent) override;
+ bool isPath() const override { return true; }
public:
SkPath fPath;
protected:
@@ -51,8 +51,8 @@
class SkPolyline : public SkDrawPath {
DECLARE_MEMBER_INFO(Polyline);
- bool addChild(SkAnimateMaker& , SkDisplayable*) SK_OVERRIDE;
- void onEndElement(SkAnimateMaker& ) SK_OVERRIDE;
+ bool addChild(SkAnimateMaker& , SkDisplayable*) override;
+ void onEndElement(SkAnimateMaker& ) override;
protected:
SkTDScalarArray points;
private:
@@ -61,7 +61,7 @@
class SkPolygon : public SkPolyline {
DECLARE_MEMBER_INFO(Polygon);
- void onEndElement(SkAnimateMaker& ) SK_OVERRIDE;
+ void onEndElement(SkAnimateMaker& ) override;
private:
typedef SkPolyline INHERITED;
};
diff --git a/src/animator/SkDrawPoint.h b/src/animator/SkDrawPoint.h
index f2077f8..03c8521 100644
--- a/src/animator/SkDrawPoint.h
+++ b/src/animator/SkDrawPoint.h
@@ -24,7 +24,7 @@
class SkDrawPoint : public SkDisplayable {
DECLARE_MEMBER_INFO(DrawPoint);
SkDrawPoint();
- void getBounds(SkRect* ) SK_OVERRIDE;
+ void getBounds(SkRect* ) override;
private:
SkPoint fPoint;
typedef SkDisplayable INHERITED;
diff --git a/src/animator/SkDrawRectangle.h b/src/animator/SkDrawRectangle.h
index 44ed7c4..036d52e 100644
--- a/src/animator/SkDrawRectangle.h
+++ b/src/animator/SkDrawRectangle.h
@@ -19,15 +19,15 @@
class SkDrawRect : public SkBoundable {
DECLARE_DRAW_MEMBER_INFO(Rect);
SkDrawRect();
- void dirty() SK_OVERRIDE;
- bool draw(SkAnimateMaker& ) SK_OVERRIDE;
+ void dirty() override;
+ bool draw(SkAnimateMaker& ) override;
#ifdef SK_DUMP_ENABLED
- void dump(SkAnimateMaker* ) SK_OVERRIDE;
+ void dump(SkAnimateMaker* ) override;
#endif
- SkDisplayable* getParent() const SK_OVERRIDE;
- bool getProperty(int index, SkScriptValue* value) const SK_OVERRIDE;
- bool setParent(SkDisplayable* parent) SK_OVERRIDE;
- bool setProperty(int index, SkScriptValue& ) SK_OVERRIDE;
+ SkDisplayable* getParent() const override;
+ bool getProperty(int index, SkScriptValue* value) const override;
+ bool setParent(SkDisplayable* parent) override;
+ bool setProperty(int index, SkScriptValue& ) override;
protected:
SkRect fRect;
SkDisplayable* fParent;
@@ -41,9 +41,9 @@
class SkRoundRect : public SkDrawRect {
DECLARE_MEMBER_INFO(RoundRect);
SkRoundRect();
- bool draw(SkAnimateMaker& ) SK_OVERRIDE;
+ bool draw(SkAnimateMaker& ) override;
#ifdef SK_DUMP_ENABLED
- void dump(SkAnimateMaker* ) SK_OVERRIDE;
+ void dump(SkAnimateMaker* ) override;
#endif
protected:
SkScalar rx;
diff --git a/src/animator/SkDrawSaveLayer.h b/src/animator/SkDrawSaveLayer.h
index 1080e81..cb9c9a9 100644
--- a/src/animator/SkDrawSaveLayer.h
+++ b/src/animator/SkDrawSaveLayer.h
@@ -20,11 +20,11 @@
DECLARE_MEMBER_INFO(SaveLayer);
SkSaveLayer();
virtual ~SkSaveLayer();
- bool draw(SkAnimateMaker& ) SK_OVERRIDE;
+ bool draw(SkAnimateMaker& ) override;
#ifdef SK_DUMP_ENABLED
- void dump(SkAnimateMaker* ) SK_OVERRIDE;
+ void dump(SkAnimateMaker* ) override;
#endif
- void onEndElement(SkAnimateMaker& ) SK_OVERRIDE;
+ void onEndElement(SkAnimateMaker& ) override;
protected:
SkDrawPaint* paint;
SkDrawRect* bounds;
diff --git a/src/animator/SkDrawShader.h b/src/animator/SkDrawShader.h
index 32c8fd5..f7ef29d 100644
--- a/src/animator/SkDrawShader.h
+++ b/src/animator/SkDrawShader.h
@@ -16,8 +16,8 @@
class SkDrawBitmapShader : public SkDrawShader {
DECLARE_DRAW_MEMBER_INFO(BitmapShader);
SkDrawBitmapShader();
- bool add() SK_OVERRIDE;
- SkShader* getShader() SK_OVERRIDE;
+ bool add() override;
+ SkShader* getShader() override;
protected:
SkBool filterBitmap;
SkBaseBitmap* image;
diff --git a/src/animator/SkDrawText.h b/src/animator/SkDrawText.h
index 2630007..e7632d0 100644
--- a/src/animator/SkDrawText.h
+++ b/src/animator/SkDrawText.h
@@ -17,11 +17,11 @@
DECLARE_MEMBER_INFO(Text);
SkText();
virtual ~SkText();
- bool draw(SkAnimateMaker& ) SK_OVERRIDE;
+ bool draw(SkAnimateMaker& ) override;
#ifdef SK_DUMP_ENABLED
- void dump(SkAnimateMaker* ) SK_OVERRIDE;
+ void dump(SkAnimateMaker* ) override;
#endif
- bool getProperty(int index, SkScriptValue* value) const SK_OVERRIDE;
+ bool getProperty(int index, SkScriptValue* value) const override;
const char* getText() { return text.c_str(); }
size_t getSize() { return text.size(); }
protected:
diff --git a/src/animator/SkDrawTextBox.h b/src/animator/SkDrawTextBox.h
index 4bb3bf2..8f99c73 100644
--- a/src/animator/SkDrawTextBox.h
+++ b/src/animator/SkDrawTextBox.h
@@ -18,12 +18,12 @@
SkDrawTextBox();
// overrides
- bool draw(SkAnimateMaker& ) SK_OVERRIDE;
+ bool draw(SkAnimateMaker& ) override;
#ifdef SK_DUMP_ENABLED
- void dump(SkAnimateMaker* ) SK_OVERRIDE;
+ void dump(SkAnimateMaker* ) override;
#endif
- bool getProperty(int index, SkScriptValue* value) const SK_OVERRIDE;
- bool setProperty(int index, SkScriptValue& ) SK_OVERRIDE;
+ bool getProperty(int index, SkScriptValue* value) const override;
+ bool setProperty(int index, SkScriptValue& ) override;
private:
SkString fText;
diff --git a/src/animator/SkDrawTo.h b/src/animator/SkDrawTo.h
index 0c089d6..29f6b63 100644
--- a/src/animator/SkDrawTo.h
+++ b/src/animator/SkDrawTo.h
@@ -19,9 +19,9 @@
DECLARE_MEMBER_INFO(DrawTo);
SkDrawTo();
// virtual ~SkDrawTo();
- bool draw(SkAnimateMaker& ) SK_OVERRIDE;
+ bool draw(SkAnimateMaker& ) override;
#ifdef SK_DUMP_ENABLED
- void dump(SkAnimateMaker* ) SK_OVERRIDE;
+ void dump(SkAnimateMaker* ) override;
#endif
protected:
SkBool drawOnce;
diff --git a/src/animator/SkDrawTransparentShader.h b/src/animator/SkDrawTransparentShader.h
index b6ab7c7..5b5b156 100644
--- a/src/animator/SkDrawTransparentShader.h
+++ b/src/animator/SkDrawTransparentShader.h
@@ -12,7 +12,7 @@
class SkDrawTransparentShader : public SkDrawShader {
DECLARE_EMPTY_MEMBER_INFO(TransparentShader);
- SkShader* getShader() SK_OVERRIDE;
+ SkShader* getShader() override;
};
#endif // SkDrawTransparentShader_DEFINED
diff --git a/src/animator/SkDump.h b/src/animator/SkDump.h
index 86e9e08..bedd533 100644
--- a/src/animator/SkDump.h
+++ b/src/animator/SkDump.h
@@ -20,9 +20,9 @@
DECLARE_MEMBER_INFO(Dump);
#ifdef SK_DUMP_ENABLED
SkDump();
- bool enable(SkAnimateMaker & ) SK_OVERRIDE;
+ bool enable(SkAnimateMaker & ) override;
bool evaluate(SkAnimateMaker &);
- bool hasEnable() const SK_OVERRIDE;
+ bool hasEnable() const override;
static void GetEnumString(SkDisplayTypes , int index, SkString* result);
SkBool displayList;
SkBool eventList;
diff --git a/src/animator/SkHitClear.h b/src/animator/SkHitClear.h
index 3e09700..042c181 100644
--- a/src/animator/SkHitClear.h
+++ b/src/animator/SkHitClear.h
@@ -16,8 +16,8 @@
class SkHitClear : public SkDisplayable {
DECLARE_MEMBER_INFO(HitClear);
- bool enable(SkAnimateMaker& ) SK_OVERRIDE;
- bool hasEnable() const SK_OVERRIDE;
+ bool enable(SkAnimateMaker& ) override;
+ bool hasEnable() const override;
private:
SkTDDisplayableArray targets;
};
diff --git a/src/animator/SkHitTest.h b/src/animator/SkHitTest.h
index f79dab0..bd1cbe2 100644
--- a/src/animator/SkHitTest.h
+++ b/src/animator/SkHitTest.h
@@ -16,10 +16,10 @@
class SkHitTest : public SkADrawable {
DECLARE_MEMBER_INFO(HitTest);
SkHitTest();
- bool draw(SkAnimateMaker& ) SK_OVERRIDE;
- bool enable(SkAnimateMaker& ) SK_OVERRIDE;
- bool hasEnable() const SK_OVERRIDE;
- const SkMemberInfo* preferredChild(SkDisplayTypes type) SK_OVERRIDE;
+ bool draw(SkAnimateMaker& ) override;
+ bool enable(SkAnimateMaker& ) override;
+ bool hasEnable() const override;
+ const SkMemberInfo* preferredChild(SkDisplayTypes type) override;
private:
SkTDDisplayableArray bullets;
SkTDIntArray hits;
diff --git a/src/animator/SkMatrixParts.h b/src/animator/SkMatrixParts.h
index e6a8850..3276d02 100644
--- a/src/animator/SkMatrixParts.h
+++ b/src/animator/SkMatrixParts.h
@@ -39,7 +39,7 @@
DECLARE_MEMBER_INFO(Rotate);
SkRotate();
protected:
- bool add() SK_OVERRIDE;
+ bool add() override;
SkScalar degrees;
SkPoint center;
};
@@ -48,7 +48,7 @@
DECLARE_MEMBER_INFO(Scale);
SkScale();
protected:
- bool add() SK_OVERRIDE;
+ bool add() override;
SkScalar x;
SkScalar y;
SkPoint center;
@@ -58,7 +58,7 @@
DECLARE_MEMBER_INFO(Skew);
SkSkew();
protected:
- bool add() SK_OVERRIDE;
+ bool add() override;
SkScalar x;
SkScalar y;
SkPoint center;
@@ -68,7 +68,7 @@
DECLARE_MEMBER_INFO(Translate);
SkTranslate();
protected:
- bool add() SK_OVERRIDE;
+ bool add() override;
SkScalar x;
SkScalar y;
};
@@ -78,7 +78,7 @@
SkFromPath();
virtual ~SkFromPath();
protected:
- bool add() SK_OVERRIDE;
+ bool add() override;
int32_t mode;
SkScalar offset;
SkDrawPath* path;
@@ -90,11 +90,11 @@
SkRectToRect();
virtual ~SkRectToRect();
#ifdef SK_DUMP_ENABLED
- void dump(SkAnimateMaker* ) SK_OVERRIDE;
+ void dump(SkAnimateMaker* ) override;
#endif
- const SkMemberInfo* preferredChild(SkDisplayTypes type) SK_OVERRIDE;
+ const SkMemberInfo* preferredChild(SkDisplayTypes type) override;
protected:
- bool add() SK_OVERRIDE;
+ bool add() override;
SkDrawRect* source;
SkDrawRect* destination;
};
@@ -104,12 +104,12 @@
SkPolyToPoly();
virtual ~SkPolyToPoly();
#ifdef SK_DUMP_ENABLED
- void dump(SkAnimateMaker* ) SK_OVERRIDE;
+ void dump(SkAnimateMaker* ) override;
#endif
- void onEndElement(SkAnimateMaker& ) SK_OVERRIDE;
- const SkMemberInfo* preferredChild(SkDisplayTypes type) SK_OVERRIDE;
+ void onEndElement(SkAnimateMaker& ) override;
+ const SkMemberInfo* preferredChild(SkDisplayTypes type) override;
protected:
- bool add() SK_OVERRIDE;
+ bool add() override;
SkPolygon* source;
SkPolygon* destination;
};
diff --git a/src/animator/SkMemberInfo.h b/src/animator/SkMemberInfo.h
index c0d9e20..e07c322 100644
--- a/src/animator/SkMemberInfo.h
+++ b/src/animator/SkMemberInfo.h
@@ -150,49 +150,49 @@
public: \
static const SkMemberInfo fInfo[]; \
static const int fInfoCount; \
- const SkMemberInfo* getMember(int index) SK_OVERRIDE; \
- const SkMemberInfo* getMember(const char name[]) SK_OVERRIDE; \
+ const SkMemberInfo* getMember(int index) override; \
+ const SkMemberInfo* getMember(const char name[]) override; \
typedef Sk##_type BASE_CLASS
#define DECLARE_MEMBER_INFO(_type) \
public: \
static const SkMemberInfo fInfo[]; \
static const int fInfoCount; \
- const SkMemberInfo* getMember(int index) SK_OVERRIDE; \
- const SkMemberInfo* getMember(const char name[]) SK_OVERRIDE; \
- SkDisplayTypes getType() const SK_OVERRIDE { return SkType_##_type; } \
+ const SkMemberInfo* getMember(int index) override; \
+ const SkMemberInfo* getMember(const char name[]) override; \
+ SkDisplayTypes getType() const override { return SkType_##_type; } \
typedef Sk##_type BASE_CLASS
#define DECLARE_DRAW_MEMBER_INFO(_type) \
public: \
static const SkMemberInfo fInfo[]; \
static const int fInfoCount; \
- const SkMemberInfo* getMember(int index) SK_OVERRIDE; \
- const SkMemberInfo* getMember(const char name[]) SK_OVERRIDE; \
- SkDisplayTypes getType() const SK_OVERRIDE { return SkType_##_type; } \
+ const SkMemberInfo* getMember(int index) override; \
+ const SkMemberInfo* getMember(const char name[]) override; \
+ SkDisplayTypes getType() const override { return SkType_##_type; } \
typedef SkDraw##_type BASE_CLASS
#define DECLARE_DISPLAY_MEMBER_INFO(_type) \
public: \
static const SkMemberInfo fInfo[]; \
static const int fInfoCount; \
- const SkMemberInfo* getMember(int index) SK_OVERRIDE; \
- const SkMemberInfo* getMember(const char name[]) SK_OVERRIDE; \
- SkDisplayTypes getType() const SK_OVERRIDE { return SkType_##_type; } \
+ const SkMemberInfo* getMember(int index) override; \
+ const SkMemberInfo* getMember(const char name[]) override; \
+ SkDisplayTypes getType() const override { return SkType_##_type; } \
typedef SkDisplay##_type BASE_CLASS
#define DECLARE_EMPTY_MEMBER_INFO(_type) \
public: \
- SkDisplayTypes getType() const SK_OVERRIDE { return SkType_##_type; }
+ SkDisplayTypes getType() const override { return SkType_##_type; }
#define DECLARE_EXTRAS_MEMBER_INFO(_type) \
public: \
static const SkMemberInfo fInfo[]; \
static const int fInfoCount; \
- const SkMemberInfo* getMember(int index) SK_OVERRIDE; \
- const SkMemberInfo* getMember(const char name[]) SK_OVERRIDE; \
+ const SkMemberInfo* getMember(int index) override; \
+ const SkMemberInfo* getMember(const char name[]) override; \
SkDisplayTypes fType; \
- SkDisplayTypes getType() const SK_OVERRIDE { return fType; } \
+ SkDisplayTypes getType() const override { return fType; } \
typedef _type BASE_CLASS
#define DECLARE_NO_VIRTUALS_MEMBER_INFO(_type) \
diff --git a/src/animator/SkPaintPart.h b/src/animator/SkPaintPart.h
index a285a1c..2907d81 100644
--- a/src/animator/SkPaintPart.h
+++ b/src/animator/SkPaintPart.h
@@ -35,14 +35,14 @@
DECLARE_EMPTY_MEMBER_INFO(MaskFilter);
virtual SkMaskFilter* getMaskFilter();
protected:
- bool add() SK_OVERRIDE;
+ bool add() override;
};
class SkDrawPathEffect : public SkPaintPart {
DECLARE_EMPTY_MEMBER_INFO(PathEffect);
virtual SkPathEffect* getPathEffect();
protected:
- bool add() SK_OVERRIDE;
+ bool add() override;
};
class SkDrawShader : public SkPaintPart {
@@ -50,7 +50,7 @@
SkDrawShader();
virtual SkShader* getShader();
protected:
- bool add() SK_OVERRIDE;
+ bool add() override;
SkMatrix* getMatrix(); // returns NULL if matrix is NULL
SkDrawMatrix* matrix;
int /*SkShader::TileMode*/ tileMode;
@@ -60,12 +60,12 @@
DECLARE_DRAW_MEMBER_INFO(Typeface);
SkDrawTypeface();
#ifdef SK_DUMP_ENABLED
- void dump(SkAnimateMaker *) SK_OVERRIDE;
+ void dump(SkAnimateMaker *) override;
#endif
SkTypeface* getTypeface() {
return SkTypeface::CreateFromName(fontName.c_str(), style); }
protected:
- bool add() SK_OVERRIDE;
+ bool add() override;
SkString fontName;
SkTypeface::Style style;
};
diff --git a/src/animator/SkPathParts.h b/src/animator/SkPathParts.h
index 6aad1ba..afa7b66 100644
--- a/src/animator/SkPathParts.h
+++ b/src/animator/SkPathParts.h
@@ -34,7 +34,7 @@
class SkMoveTo : public SkPathPart {
DECLARE_MEMBER_INFO(MoveTo);
SkMoveTo();
- bool add() SK_OVERRIDE;
+ bool add() override;
protected:
SkScalar x;
SkScalar y;
@@ -42,7 +42,7 @@
class SkRMoveTo : public SkMoveTo {
DECLARE_MEMBER_INFO(RMoveTo);
- bool add() SK_OVERRIDE;
+ bool add() override;
private:
typedef SkMoveTo INHERITED;
};
@@ -50,7 +50,7 @@
class SkLineTo : public SkPathPart {
DECLARE_MEMBER_INFO(LineTo);
SkLineTo();
- bool add() SK_OVERRIDE;
+ bool add() override;
protected:
SkScalar x;
SkScalar y;
@@ -58,7 +58,7 @@
class SkRLineTo : public SkLineTo {
DECLARE_MEMBER_INFO(RLineTo);
- bool add() SK_OVERRIDE;
+ bool add() override;
private:
typedef SkLineTo INHERITED;
};
@@ -66,7 +66,7 @@
class SkQuadTo : public SkPathPart {
DECLARE_MEMBER_INFO(QuadTo);
SkQuadTo();
- bool add() SK_OVERRIDE;
+ bool add() override;
protected:
SkScalar x1;
SkScalar y1;
@@ -76,7 +76,7 @@
class SkRQuadTo : public SkQuadTo {
DECLARE_MEMBER_INFO(RQuadTo);
- bool add() SK_OVERRIDE;
+ bool add() override;
private:
typedef SkQuadTo INHERITED;
};
@@ -84,7 +84,7 @@
class SkCubicTo : public SkPathPart {
DECLARE_MEMBER_INFO(CubicTo);
SkCubicTo();
- bool add() SK_OVERRIDE;
+ bool add() override;
protected:
SkScalar x1;
SkScalar y1;
@@ -96,14 +96,14 @@
class SkRCubicTo : public SkCubicTo {
DECLARE_MEMBER_INFO(RCubicTo);
- bool add() SK_OVERRIDE;
+ bool add() override;
private:
typedef SkCubicTo INHERITED;
};
class SkClose : public SkPathPart {
DECLARE_EMPTY_MEMBER_INFO(Close);
- bool add() SK_OVERRIDE;
+ bool add() override;
};
class SkAddGeom : public SkPathPart {
@@ -116,7 +116,7 @@
class SkAddRect : public SkAddGeom {
DECLARE_MEMBER_INFO(AddRect);
SkAddRect();
- bool add() SK_OVERRIDE;
+ bool add() override;
protected:
SkRect fRect;
private:
@@ -125,7 +125,7 @@
class SkAddOval : public SkAddRect {
DECLARE_MEMBER_INFO(AddOval);
- bool add() SK_OVERRIDE;
+ bool add() override;
private:
typedef SkAddRect INHERITED;
};
@@ -133,7 +133,7 @@
class SkAddCircle : public SkAddGeom {
DECLARE_MEMBER_INFO(AddCircle);
SkAddCircle();
- bool add() SK_OVERRIDE;
+ bool add() override;
private:
SkScalar radius;
SkScalar x;
@@ -144,7 +144,7 @@
class SkAddRoundRect : public SkAddRect {
DECLARE_MEMBER_INFO(AddRoundRect);
SkAddRoundRect();
- bool add() SK_OVERRIDE;
+ bool add() override;
private:
SkScalar rx;
SkScalar ry;
@@ -154,7 +154,7 @@
class SkAddPath : public SkPathPart {
DECLARE_MEMBER_INFO(AddPath);
SkAddPath();
- bool add() SK_OVERRIDE;
+ bool add() override;
private:
typedef SkPathPart INHERITED;
SkDrawMatrix* matrix;
diff --git a/src/animator/SkPostParts.h b/src/animator/SkPostParts.h
index f48c33f..fb2845b 100644
--- a/src/animator/SkPostParts.h
+++ b/src/animator/SkPostParts.h
@@ -18,10 +18,10 @@
DECLARE_MEMBER_INFO(DataInput);
SkDataInput();
bool add();
- void dirty() SK_OVERRIDE;
- SkDisplayable* getParent() const SK_OVERRIDE;
- void onEndElement(SkAnimateMaker& ) SK_OVERRIDE;
- bool setParent(SkDisplayable* ) SK_OVERRIDE;
+ void dirty() override;
+ SkDisplayable* getParent() const override;
+ void onEndElement(SkAnimateMaker& ) override;
+ bool setParent(SkDisplayable* ) override;
protected:
SkPost* fParent;
typedef SkInput INHERITED;
diff --git a/src/animator/SkSnapshot.h b/src/animator/SkSnapshot.h
index e3b36d1..a4eb175 100644
--- a/src/animator/SkSnapshot.h
+++ b/src/animator/SkSnapshot.h
@@ -18,7 +18,7 @@
class SkSnapshot: public SkADrawable {
DECLARE_MEMBER_INFO(Snapshot);
SkSnapshot();
- bool draw(SkAnimateMaker& ) SK_OVERRIDE;
+ bool draw(SkAnimateMaker& ) override;
private:
SkString filename;
SkScalar quality;
diff --git a/src/animator/SkTextOnPath.h b/src/animator/SkTextOnPath.h
index fb1f6f2..36adfd5 100644
--- a/src/animator/SkTextOnPath.h
+++ b/src/animator/SkTextOnPath.h
@@ -19,7 +19,7 @@
class SkTextOnPath : public SkBoundable {
DECLARE_MEMBER_INFO(TextOnPath);
SkTextOnPath();
- bool draw(SkAnimateMaker& ) SK_OVERRIDE;
+ bool draw(SkAnimateMaker& ) override;
private:
SkScalar offset;
SkDrawPath* path;
diff --git a/src/animator/SkTextToPath.h b/src/animator/SkTextToPath.h
index 2be67ad..23b6bfe 100644
--- a/src/animator/SkTextToPath.h
+++ b/src/animator/SkTextToPath.h
@@ -20,8 +20,8 @@
class SkTextToPath : public SkADrawable {
DECLARE_MEMBER_INFO(TextToPath);
SkTextToPath();
- bool draw(SkAnimateMaker& ) SK_OVERRIDE;
- void onEndElement(SkAnimateMaker& ) SK_OVERRIDE;
+ bool draw(SkAnimateMaker& ) override;
+ void onEndElement(SkAnimateMaker& ) override;
private:
SkDrawPaint* paint;
SkDrawPath* path;
diff --git a/src/animator/SkXMLAnimatorWriter.h b/src/animator/SkXMLAnimatorWriter.h
index 1aedada..2f6721d 100644
--- a/src/animator/SkXMLAnimatorWriter.h
+++ b/src/animator/SkXMLAnimatorWriter.h
@@ -23,10 +23,10 @@
SkDEBUGCODE(static void UnitTest(class SkCanvas* canvas);)
protected:
- void onAddAttributeLen(const char name[], const char value[], size_t length) SK_OVERRIDE;
- void onEndElement() SK_OVERRIDE;
- void onStartElementLen(const char elem[], size_t length) SK_OVERRIDE;
- void onAddText(const char text[], size_t length) SK_OVERRIDE;
+ void onAddAttributeLen(const char name[], const char value[], size_t length) override;
+ void onEndElement() override;
+ void onStartElementLen(const char elem[], size_t length) override;
+ void onAddText(const char text[], size_t length) override;
private:
SkAnimator* fAnimator;