Bug 1117040 - Mark virtual overridden functions as MOZ_OVERRIDE in SV…

…G DOM code; r=longsonr
mozilla-spidermonkey · Jan 2, 2015 · 05d059e · 05d059e
1 parent d3ee964
commit 05d059e
Show file tree

Hide file tree

Showing 25 changed files with 48 additions and 48 deletions.
diff --git a/dom/svg/DOMSVGPathSeg.h b/dom/svg/DOMSVGPathSeg.h
@@ -42,25 +42,25 @@ namespace mozilla {
   }                                                                           \
   /* From DOMSVGPathSeg: */                                                   \
   virtual uint32_t                                                            \
-  Type() const                                                                \
+  Type() const MOZ_OVERRIDE                                                   \
   {                                                                           \
     return segType;                                                           \
   }                                                                           \
   virtual DOMSVGPathSeg*                                                      \
-  Clone()                                                                     \
+  Clone() MOZ_OVERRIDE                                                        \
   {                                                                           \
     /* InternalItem() + 1, because we're skipping the encoded seg type */     \
     float *args = IsInList() ? InternalItem() + 1 : mArgs;                    \
     return new DOMSVGPathSeg##segName(args);                                  \
   }                                                                           \
   virtual float*                                                              \
-  PtrToMemberArgs()                                                           \
+  PtrToMemberArgs() MOZ_OVERRIDE                                              \
   {                                                                           \
     return mArgs;                                                             \
   }                                                                           \
                                                                               \
   virtual JSObject*                                                           \
-  WrapObject(JSContext* aCx) MOZ_OVERRIDE       \
+  WrapObject(JSContext* aCx) MOZ_OVERRIDE                                     \
   {                                                                           \
     return dom::SVGPathSeg##segName##Binding::Wrap(aCx, this);        \
   }

diff --git a/dom/svg/DOMSVGPoint.h b/dom/svg/DOMSVGPoint.h
@@ -89,11 +89,11 @@ class DOMSVGPoint MOZ_FINAL : public nsISVGPoint
 
 
   // WebIDL
-  virtual float X();
-  virtual void SetX(float aX, ErrorResult& rv);
-  virtual float Y();
-  virtual void SetY(float aY, ErrorResult& rv);
-  virtual already_AddRefed<nsISVGPoint> MatrixTransform(dom::SVGMatrix& matrix);
+  virtual float X() MOZ_OVERRIDE;
+  virtual void SetX(float aX, ErrorResult& rv) MOZ_OVERRIDE;
+  virtual float Y() MOZ_OVERRIDE;
+  virtual void SetY(float aY, ErrorResult& rv) MOZ_OVERRIDE;
+  virtual already_AddRefed<nsISVGPoint> MatrixTransform(dom::SVGMatrix& matrix) MOZ_OVERRIDE;
   nsISupports* GetParentObject() MOZ_OVERRIDE {
     return mList;
   }

diff --git a/dom/svg/SVGAnimateElement.h b/dom/svg/SVGAnimateElement.h
@@ -33,7 +33,7 @@ class SVGAnimateElement MOZ_FINAL : public SVGAnimationElement
   virtual nsresult Clone(mozilla::dom::NodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
 
   // SVGAnimationElement
-  virtual nsSMILAnimationFunction& AnimationFunction();
+  virtual nsSMILAnimationFunction& AnimationFunction() MOZ_OVERRIDE;
 };
 
 } // namespace dom

diff --git a/dom/svg/SVGAnimateMotionElement.h b/dom/svg/SVGAnimateMotionElement.h
@@ -33,10 +33,10 @@ class SVGAnimateMotionElement MOZ_FINAL : public SVGAnimationElement
   virtual nsresult Clone(mozilla::dom::NodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
 
   // SVGAnimationElement
-  virtual nsSMILAnimationFunction& AnimationFunction();
+  virtual nsSMILAnimationFunction& AnimationFunction() MOZ_OVERRIDE;
   virtual bool GetTargetAttributeName(int32_t *aNamespaceID,
-                                      nsIAtom **aLocalName) const;
-  virtual nsSMILTargetAttrType GetTargetAttributeType() const;
+                                      nsIAtom **aLocalName) const MOZ_OVERRIDE;
+  virtual nsSMILTargetAttrType GetTargetAttributeType() const MOZ_OVERRIDE;
 
   // nsSVGElement
   virtual nsIAtom* GetPathDataAttrName() const MOZ_OVERRIDE {

diff --git a/dom/svg/SVGAnimateTransformElement.h b/dom/svg/SVGAnimateTransformElement.h
@@ -39,7 +39,7 @@ class SVGAnimateTransformElement MOZ_FINAL : public SVGAnimationElement
                         nsAttrValue& aResult) MOZ_OVERRIDE;
 
   // SVGAnimationElement
-  virtual nsSMILAnimationFunction& AnimationFunction();
+  virtual nsSMILAnimationFunction& AnimationFunction() MOZ_OVERRIDE;
 };
 
 } // namespace dom

diff --git a/dom/svg/SVGDefsElement.h b/dom/svg/SVGDefsElement.h
@@ -24,9 +24,9 @@ class SVGDefsElement MOZ_FINAL : public SVGGraphicsElement
 
 public:
   // nsIContent
-  NS_IMETHOD_(bool) IsAttributeMapped(const nsIAtom* aAttribute) const;
+  NS_IMETHOD_(bool) IsAttributeMapped(const nsIAtom* aAttribute) const MOZ_OVERRIDE;
 
-  virtual nsresult Clone(mozilla::dom::NodeInfo *aNodeInfo, nsINode **aResult) const;
+  virtual nsresult Clone(mozilla::dom::NodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
 };
 
 } // namespace dom

diff --git a/dom/svg/SVGFEDiffuseLightingElement.h b/dom/svg/SVGFEDiffuseLightingElement.h
@@ -34,9 +34,9 @@ class SVGFEDiffuseLightingElement : public SVGFEDiffuseLightingElementBase
                             const nsTArray<bool>& aInputsAreTainted,
                             nsTArray<mozilla::RefPtr<SourceSurface>>& aInputImages) MOZ_OVERRIDE;
   virtual bool AttributeAffectsRendering(
-          int32_t aNameSpaceID, nsIAtom* aAttribute) const;
+          int32_t aNameSpaceID, nsIAtom* aAttribute) const MOZ_OVERRIDE;
 
-  virtual nsresult Clone(mozilla::dom::NodeInfo *aNodeInfo, nsINode **aResult) const;
+  virtual nsresult Clone(mozilla::dom::NodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
 
   // WebIDL
   already_AddRefed<SVGAnimatedString> In1();

diff --git a/dom/svg/SVGFEOffsetElement.h b/dom/svg/SVGFEOffsetElement.h
@@ -37,7 +37,7 @@ class SVGFEOffsetElement : public SVGFEOffsetElementBase
                             nsTArray<mozilla::RefPtr<SourceSurface>>& aInputImages) MOZ_OVERRIDE;
   virtual bool AttributeAffectsRendering(
           int32_t aNameSpaceID, nsIAtom* aAttribute) const MOZ_OVERRIDE;
-  virtual nsSVGString& GetResultImageName() { return mStringAttributes[RESULT]; }
+  virtual nsSVGString& GetResultImageName() MOZ_OVERRIDE { return mStringAttributes[RESULT]; }
   virtual void GetSourceImageNames(nsTArray<nsSVGStringInfo>& aSources) MOZ_OVERRIDE;
 
   virtual nsresult Clone(mozilla::dom::NodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;

diff --git a/dom/svg/SVGFESpecularLightingElement.h b/dom/svg/SVGFESpecularLightingElement.h
@@ -30,15 +30,15 @@ class SVGFESpecularLightingElement : public SVGFESpecularLightingElementBase
   virtual JSObject* WrapNode(JSContext* aCx) MOZ_OVERRIDE;
 
 public:
-  virtual nsresult Clone(mozilla::dom::NodeInfo *aNodeInfo, nsINode **aResult) const;
+  virtual nsresult Clone(mozilla::dom::NodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
 
   virtual FilterPrimitiveDescription
     GetPrimitiveDescription(nsSVGFilterInstance* aInstance,
                             const IntRect& aFilterSubregion,
                             const nsTArray<bool>& aInputsAreTainted,
                             nsTArray<mozilla::RefPtr<SourceSurface>>& aInputImages) MOZ_OVERRIDE;
   virtual bool AttributeAffectsRendering(
-          int32_t aNameSpaceID, nsIAtom* aAttribute) const;
+          int32_t aNameSpaceID, nsIAtom* aAttribute) const MOZ_OVERRIDE;
 
   // WebIDL
   already_AddRefed<SVGAnimatedString> In1();

diff --git a/dom/svg/SVGFETileElement.h b/dom/svg/SVGFETileElement.h
@@ -28,7 +28,7 @@ class SVGFETileElement : public SVGFETileElementBase
   virtual JSObject* WrapNode(JSContext *cx) MOZ_OVERRIDE;
 
 public:
-  virtual bool SubregionIsUnionOfRegions() { return false; }
+  virtual bool SubregionIsUnionOfRegions() MOZ_OVERRIDE { return false; }
 
   virtual FilterPrimitiveDescription
     GetPrimitiveDescription(nsSVGFilterInstance* aInstance,

diff --git a/dom/svg/SVGGElement.h b/dom/svg/SVGGElement.h
@@ -24,9 +24,9 @@ class SVGGElement MOZ_FINAL : public SVGGraphicsElement
 
 public:
   // nsIContent
-  NS_IMETHOD_(bool) IsAttributeMapped(const nsIAtom* aAttribute) const;
+  NS_IMETHOD_(bool) IsAttributeMapped(const nsIAtom* aAttribute) const MOZ_OVERRIDE;
 
-  virtual nsresult Clone(mozilla::dom::NodeInfo *aNodeInfo, nsINode **aResult) const;
+  virtual nsresult Clone(mozilla::dom::NodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
 };
 
 } // namespace dom

diff --git a/dom/svg/SVGIFrameElement.h b/dom/svg/SVGIFrameElement.h
@@ -94,8 +94,8 @@ class SVGIFrameElement MOZ_FINAL : public SVGIFrameElementBase,
   uint32_t GetSandboxFlags();
 
 private:
-  virtual LengthAttributesInfo GetLengthInfo();
-  virtual SVGAnimatedPreserveAspectRatio *GetPreserveAspectRatio();
+  virtual LengthAttributesInfo GetLengthInfo() MOZ_OVERRIDE;
+  virtual SVGAnimatedPreserveAspectRatio *GetPreserveAspectRatio() MOZ_OVERRIDE;
   virtual mozilla::dom::Element* ThisFrameElement() MOZ_OVERRIDE
   {
     return this;

diff --git a/dom/svg/SVGIntegerPairSMILType.h b/dom/svg/SVGIntegerPairSMILType.h
@@ -28,7 +28,7 @@ class SVGIntegerPairSMILType : public nsISMILType
   // nsISMILType Methods
   // -------------------
   virtual void     Init(nsSMILValue& aValue) const MOZ_OVERRIDE;
-  virtual void     Destroy(nsSMILValue&) const;
+  virtual void     Destroy(nsSMILValue&) const MOZ_OVERRIDE;
   virtual nsresult Assign(nsSMILValue& aDest, const nsSMILValue& aSrc) const MOZ_OVERRIDE;
   virtual bool     IsEqual(const nsSMILValue& aLeft,
                            const nsSMILValue& aRight) const MOZ_OVERRIDE;

diff --git a/dom/svg/SVGLineElement.h b/dom/svg/SVGLineElement.h
@@ -35,7 +35,7 @@ class SVGLineElement MOZ_FINAL : public SVGLineElementBase
   virtual void GetAsSimplePath(SimplePath* aSimplePath) MOZ_OVERRIDE;
   virtual TemporaryRef<Path> BuildPath(PathBuilder* aBuilder) MOZ_OVERRIDE;
 
-  virtual nsresult Clone(mozilla::dom::NodeInfo *aNodeInfo, nsINode **aResult) const;
+  virtual nsresult Clone(mozilla::dom::NodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
 
   // WebIDL
   already_AddRefed<SVGAnimatedLength> X1();

diff --git a/dom/svg/SVGNumberPairSMILType.h b/dom/svg/SVGNumberPairSMILType.h
@@ -23,7 +23,7 @@ class SVGNumberPairSMILType : public nsISMILType
   // nsISMILType Methods
   // -------------------
   virtual void     Init(nsSMILValue& aValue) const MOZ_OVERRIDE;
-  virtual void     Destroy(nsSMILValue&) const;
+  virtual void     Destroy(nsSMILValue&) const MOZ_OVERRIDE;
   virtual nsresult Assign(nsSMILValue& aDest, const nsSMILValue& aSrc) const MOZ_OVERRIDE;
   virtual bool     IsEqual(const nsSMILValue& aLeft,
                            const nsSMILValue& aRight) const MOZ_OVERRIDE;

diff --git a/dom/svg/SVGOrientSMILType.h b/dom/svg/SVGOrientSMILType.h
@@ -43,7 +43,7 @@ class SVGOrientSMILType : public nsISMILType
   // nsISMILType Methods
   // -------------------
   virtual void     Init(nsSMILValue& aValue) const MOZ_OVERRIDE;
-  virtual void     Destroy(nsSMILValue&) const;
+  virtual void     Destroy(nsSMILValue&) const MOZ_OVERRIDE;
   virtual nsresult Assign(nsSMILValue& aDest, const nsSMILValue& aSrc) const MOZ_OVERRIDE;
   virtual bool     IsEqual(const nsSMILValue& aLeft,
                            const nsSMILValue& aRight) const MOZ_OVERRIDE;

diff --git a/dom/svg/SVGPolygonElement.h b/dom/svg/SVGPolygonElement.h
@@ -30,7 +30,7 @@ class SVGPolygonElement MOZ_FINAL : public SVGPolygonElementBase
   virtual void GetMarkPoints(nsTArray<nsSVGMark> *aMarks) MOZ_OVERRIDE;
   virtual mozilla::TemporaryRef<Path> BuildPath(PathBuilder* aBuilder) MOZ_OVERRIDE;
 
-  virtual nsresult Clone(mozilla::dom::NodeInfo *aNodeInfo, nsINode **aResult) const;
+  virtual nsresult Clone(mozilla::dom::NodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
 };
 
 } // namespace dom

diff --git a/dom/svg/SVGPolylineElement.h b/dom/svg/SVGPolylineElement.h
@@ -29,7 +29,7 @@ class SVGPolylineElement MOZ_FINAL : public SVGPolylineElementBase
 
 public:
   // nsIContent interface
-  virtual nsresult Clone(mozilla::dom::NodeInfo *aNodeInfo, nsINode **aResult) const;
+  virtual nsresult Clone(mozilla::dom::NodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
 };
 
 } // namespace mozilla

diff --git a/dom/svg/SVGRect.h b/dom/svg/SVGRect.h
@@ -66,7 +66,7 @@ class SVGRect MOZ_FINAL : public SVGIRect
     mHeight = aHeight;
   }
 
-  virtual nsIContent* GetParentObject() const
+  virtual nsIContent* GetParentObject() const MOZ_OVERRIDE
   {
     return mParent;
   }

diff --git a/dom/svg/SVGSetElement.h b/dom/svg/SVGSetElement.h
@@ -33,7 +33,7 @@ class SVGSetElement MOZ_FINAL : public SVGAnimationElement
   virtual nsresult Clone(mozilla::dom::NodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
 
   // SVGAnimationElement
-  virtual nsSMILAnimationFunction& AnimationFunction();
+  virtual nsSMILAnimationFunction& AnimationFunction() MOZ_OVERRIDE;
 };
 
 } // namespace dom

diff --git a/dom/svg/SVGSwitchElement.h b/dom/svg/SVGSwitchElement.h
@@ -40,13 +40,13 @@ class SVGSwitchElement MOZ_FINAL : public SVGSwitchElementBase
                                            SVGSwitchElementBase)
   // nsINode
   virtual nsresult InsertChildAt(nsIContent* aKid, uint32_t aIndex,
-                                 bool aNotify);
-  virtual void RemoveChildAt(uint32_t aIndex, bool aNotify);
+                                 bool aNotify) MOZ_OVERRIDE;
+  virtual void RemoveChildAt(uint32_t aIndex, bool aNotify) MOZ_OVERRIDE;
 
   // nsIContent
-  NS_IMETHOD_(bool) IsAttributeMapped(const nsIAtom* aAttribute) const;
+  NS_IMETHOD_(bool) IsAttributeMapped(const nsIAtom* aAttribute) const MOZ_OVERRIDE;
 
-  virtual nsresult Clone(mozilla::dom::NodeInfo *aNodeInfo, nsINode **aResult) const;
+  virtual nsresult Clone(mozilla::dom::NodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
 private:
   void UpdateActiveChild()
   { mActiveChild = FindActiveChild(); }

diff --git a/dom/svg/SVGSymbolElement.h b/dom/svg/SVGSymbolElement.h
@@ -35,17 +35,17 @@ class SVGSymbolElement MOZ_FINAL : public SVGSymbolElementBase,
   NS_DECL_ISUPPORTS_INHERITED
 
   // nsIContent interface
-  NS_IMETHOD_(bool) IsAttributeMapped(const nsIAtom* name) const;
+  NS_IMETHOD_(bool) IsAttributeMapped(const nsIAtom* name) const MOZ_OVERRIDE;
 
-  virtual nsresult Clone(mozilla::dom::NodeInfo *aNodeInfo, nsINode **aResult) const;
+  virtual nsresult Clone(mozilla::dom::NodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
 
   // WebIDL
   already_AddRefed<SVGAnimatedRect> ViewBox();
   already_AddRefed<DOMSVGAnimatedPreserveAspectRatio> PreserveAspectRatio();
 
 protected:
-  virtual nsSVGViewBox *GetViewBox();
-  virtual SVGAnimatedPreserveAspectRatio *GetPreserveAspectRatio();
+  virtual nsSVGViewBox *GetViewBox() MOZ_OVERRIDE;
+  virtual SVGAnimatedPreserveAspectRatio *GetPreserveAspectRatio() MOZ_OVERRIDE;
 
   nsSVGViewBox mViewBox;
   SVGAnimatedPreserveAspectRatio mPreserveAspectRatio;

diff --git a/dom/svg/SVGTextElement.h b/dom/svg/SVGTextElement.h
@@ -27,9 +27,9 @@ class SVGTextElement MOZ_FINAL : public SVGTextElementBase
 
 public:
   // nsIContent interface
-  NS_IMETHOD_(bool) IsAttributeMapped(const nsIAtom* aAttribute) const;
+  NS_IMETHOD_(bool) IsAttributeMapped(const nsIAtom* aAttribute) const MOZ_OVERRIDE;
 
-  virtual nsresult Clone(mozilla::dom::NodeInfo *aNodeInfo, nsINode **aResult) const;
+  virtual nsresult Clone(mozilla::dom::NodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
 
 protected:
   virtual EnumAttributesInfo GetEnumInfo() MOZ_OVERRIDE;

diff --git a/dom/svg/SVGViewBoxSMILType.h b/dom/svg/SVGViewBoxSMILType.h
@@ -23,7 +23,7 @@ class SVGViewBoxSMILType : public nsISMILType
   // nsISMILType Methods
   // -------------------
   virtual void     Init(nsSMILValue& aValue) const MOZ_OVERRIDE;
-  virtual void     Destroy(nsSMILValue&) const;
+  virtual void     Destroy(nsSMILValue&) const MOZ_OVERRIDE;
   virtual nsresult Assign(nsSMILValue& aDest, const nsSMILValue& aSrc) const MOZ_OVERRIDE;
   virtual bool     IsEqual(const nsSMILValue& aLeft,
                            const nsSMILValue& aRight) const MOZ_OVERRIDE;

diff --git a/dom/svg/nsSVGPolyElement.h b/dom/svg/nsSVGPolyElement.h
@@ -29,12 +29,12 @@ class nsSVGPolyElement : public nsSVGPolyElementBase
   NS_DECL_ISUPPORTS_INHERITED
 
   // nsIContent interface
-  NS_IMETHOD_(bool) IsAttributeMapped(const nsIAtom* name) const;
+  NS_IMETHOD_(bool) IsAttributeMapped(const nsIAtom* name) const MOZ_OVERRIDE;
 
-  virtual SVGAnimatedPointList* GetAnimatedPointList() {
+  virtual SVGAnimatedPointList* GetAnimatedPointList() MOZ_OVERRIDE {
     return &mPoints;
   }
-  virtual nsIAtom* GetPointListAttrName() const {
+  virtual nsIAtom* GetPointListAttrName() const MOZ_OVERRIDE {
     return nsGkAtoms::points;
   }