C++11 override should now be supported by all of {bots,Chrome,Android,Mozilla}

src/animator/SkAnimateBase.h

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef SkAnimateBase_DEFINED
 #define SkAnimateBase_DEFINED
 
 #include "SkDisplayable.h"
 #include "SkMath.h"
 #include "SkMemberInfo.h"
 #include "SkTypedArray.h"
 
 class SkApply;
 class SkADrawable;
 
 class SkAnimateBase : public SkDisplayable {
 public:
     DECLARE_MEMBER_INFO(AnimateBase);
     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:
     SkMSec begin;
     SkTDScalarArray blend;
     SkMSec dur;
     // !!! make field part of a union with fFieldInfo, or fValues, something known later?
     SkString field; // temporary; once target is known, this is reset
     SkString formula;
     SkString from;
@@ skipping 17 matching lines @@
     unsigned fResetPending : 1;
     unsigned fTargetIsScope : 1;
 private:
     typedef SkDisplayable INHERITED;
     friend class SkActive;
     friend class SkApply;
     friend class SkDisplayList;
 };
 
 #endif // SkAnimateBase_DEFINED