Fix up all the easy virtual ... SK_OVERRIDE cases.

src/animator/SkMemberInfo.h

Index: src/animator/SkMemberInfo.h
diff --git a/src/animator/SkMemberInfo.h b/src/animator/SkMemberInfo.h
index cf4b0a85becf341df351c2da701aeddf6a7bed29..c0d9e2087afdd09a6a7bdb4d2701345dfeef3160 100644
--- a/src/animator/SkMemberInfo.h
+++ b/src/animator/SkMemberInfo.h
@@ -150,49 +150,49 @@ struct SkMemberInfo {
 public: \
     static const SkMemberInfo fInfo[]; \
     static const int fInfoCount; \
-    virtual const SkMemberInfo* getMember(int index) SK_OVERRIDE; \
-    virtual const SkMemberInfo* getMember(const char name[]) SK_OVERRIDE; \
+    const SkMemberInfo* getMember(int index) SK_OVERRIDE; \
+    const SkMemberInfo* getMember(const char name[]) SK_OVERRIDE; \
     typedef Sk##_type BASE_CLASS
 
 #define DECLARE_MEMBER_INFO(_type) \
 public: \
     static const SkMemberInfo fInfo[]; \
     static const int fInfoCount; \
-    virtual const SkMemberInfo* getMember(int index) SK_OVERRIDE; \
-    virtual const SkMemberInfo* getMember(const char name[]) SK_OVERRIDE; \
-    virtual SkDisplayTypes getType() const SK_OVERRIDE { return SkType_##_type; } \
+    const SkMemberInfo* getMember(int index) SK_OVERRIDE; \
+    const SkMemberInfo* getMember(const char name[]) SK_OVERRIDE; \
+    SkDisplayTypes getType() const SK_OVERRIDE { return SkType_##_type; } \
     typedef Sk##_type BASE_CLASS
 
 #define DECLARE_DRAW_MEMBER_INFO(_type) \
 public: \
     static const SkMemberInfo fInfo[]; \
     static const int fInfoCount; \
-    virtual const SkMemberInfo* getMember(int index) SK_OVERRIDE; \
-    virtual const SkMemberInfo* getMember(const char name[]) SK_OVERRIDE; \
-    virtual SkDisplayTypes getType() const SK_OVERRIDE { return SkType_##_type; } \
+    const SkMemberInfo* getMember(int index) SK_OVERRIDE; \
+    const SkMemberInfo* getMember(const char name[]) SK_OVERRIDE; \
+    SkDisplayTypes getType() const SK_OVERRIDE { return SkType_##_type; } \
     typedef SkDraw##_type BASE_CLASS
 
 #define DECLARE_DISPLAY_MEMBER_INFO(_type) \
 public: \
     static const SkMemberInfo fInfo[]; \
     static const int fInfoCount; \
-    virtual const SkMemberInfo* getMember(int index) SK_OVERRIDE; \
-    virtual const SkMemberInfo* getMember(const char name[]) SK_OVERRIDE; \
-    virtual SkDisplayTypes getType() const SK_OVERRIDE { return SkType_##_type; } \
+    const SkMemberInfo* getMember(int index) SK_OVERRIDE; \
+    const SkMemberInfo* getMember(const char name[]) SK_OVERRIDE; \
+    SkDisplayTypes getType() const SK_OVERRIDE { return SkType_##_type; } \
     typedef SkDisplay##_type BASE_CLASS
 
 #define DECLARE_EMPTY_MEMBER_INFO(_type) \
 public: \
-    virtual SkDisplayTypes getType() const SK_OVERRIDE { return SkType_##_type; }
+    SkDisplayTypes getType() const SK_OVERRIDE { return SkType_##_type; }
 
 #define DECLARE_EXTRAS_MEMBER_INFO(_type) \
 public: \
     static const SkMemberInfo fInfo[]; \
     static const int fInfoCount; \
-    virtual const SkMemberInfo* getMember(int index) SK_OVERRIDE; \
-    virtual const SkMemberInfo* getMember(const char name[]) SK_OVERRIDE; \
+    const SkMemberInfo* getMember(int index) SK_OVERRIDE; \
+    const SkMemberInfo* getMember(const char name[]) SK_OVERRIDE; \
     SkDisplayTypes fType; \
-    virtual SkDisplayTypes getType() const SK_OVERRIDE { return fType; } \
+    SkDisplayTypes getType() const SK_OVERRIDE { return fType; } \
     typedef _type BASE_CLASS
 
 #define DECLARE_NO_VIRTUALS_MEMBER_INFO(_type) \