Bug 1355349 - Drop 'virtual' annotation from overridden methods in nsSMILCSSValueType.h draft
authorBrian Birtles <birtles@gmail.com>
Fri, 26 May 2017 15:24:58 +0900
changeset 584900 3464b974502a440e4da8f46233a1196e02cde4b2
parent 584899 ba010d561b1c9eaee9bbe58f954608d7e1c7b266
child 584901 6f42582bac9ac3c08fe92d357e1a2eee0454e78a
child 584902 f55e6663f31d400df59712eafb00eb0dc68a4d28
push id60926
push userbbirtles@mozilla.com
push dateFri, 26 May 2017 07:05:40 +0000
bugs1355349
milestone55.0a1
Bug 1355349 - Drop 'virtual' annotation from overridden methods in nsSMILCSSValueType.h Our coding style says we should only use one of either 'virtual' or 'override'. In the next patch I would like to add another override to this header so first we should tidy up the existing declarations. MozReview-Commit-ID: H5ON1vSBAGc
dom/smil/nsSMILCSSValueType.h
--- a/dom/smil/nsSMILCSSValueType.h
+++ b/dom/smil/nsSMILCSSValueType.h
@@ -32,32 +32,32 @@ public:
   typedef mozilla::AnimationValue AnimationValue;
 
   // Singleton for nsSMILValue objects to hold onto.
   static nsSMILCSSValueType sSingleton;
 
 protected:
   // nsISMILType Methods
   // -------------------
-  virtual void     Init(nsSMILValue& aValue) const override;
-  virtual void     Destroy(nsSMILValue&) const override;
-  virtual nsresult Assign(nsSMILValue& aDest,
-                          const nsSMILValue& aSrc) const override;
-  virtual bool     IsEqual(const nsSMILValue& aLeft,
-                           const nsSMILValue& aRight) const override;
-  virtual nsresult Add(nsSMILValue& aDest,
-                       const nsSMILValue& aValueToAdd,
-                       uint32_t aCount) const override;
-  virtual nsresult ComputeDistance(const nsSMILValue& aFrom,
-                                   const nsSMILValue& aTo,
+  void     Init(nsSMILValue& aValue) const override;
+  void     Destroy(nsSMILValue&) const override;
+  nsresult Assign(nsSMILValue& aDest,
+                  const nsSMILValue& aSrc) const override;
+  bool     IsEqual(const nsSMILValue& aLeft,
+                   const nsSMILValue& aRight) const override;
+  nsresult Add(nsSMILValue& aDest,
+               const nsSMILValue& aValueToAdd,
+               uint32_t aCount) const override;
+  nsresult ComputeDistance(const nsSMILValue& aFrom,
+                           const nsSMILValue& aTo,
                                    double& aDistance) const override;
-  virtual nsresult Interpolate(const nsSMILValue& aStartVal,
-                               const nsSMILValue& aEndVal,
-                               double aUnitDistance,
-                               nsSMILValue& aResult) const override;
+  nsresult Interpolate(const nsSMILValue& aStartVal,
+                       const nsSMILValue& aEndVal,
+                       double aUnitDistance,
+                       nsSMILValue& aResult) const override;
 
 public:
   // Helper Methods
   // --------------
   /**
    * Sets up the given nsSMILValue to represent the given string value.  The
    * string is interpreted as a value for the given property on the given
    * element.