Bug 1522208: Clean up nsCOMPtr.h includes in dom/svg. r=longsonr

A lot of files include nsCOMPtr without really needing it in dom/svg. (And a
few files use the nsCOMPtr type without including its header.)

For this patch, I found candidate files by just searching for files that only
had a single line that contained "nsCOMPtr", and I took the following actions:
 - If the match is an #include, then remove it (replacing it with the include
   for RefPtr or AlreadyAddrefed if the file uses those types instead).
 - If the match is a usage of the type, then add an #include for nsCOMPtr (as
   well as one for RefPtr, if the file uses that type).

(And in a few cases, I moved an adjacent #include, to get the #include list
closer to sortedness.)

I verified that the dom/svg directory continues to build successfully in
non-unified mode (i.e. if I remove UNIFIED_ from its moz.build file).  So, I'm
not removing any includes that files are now inadvertantly leaning on other
compilation units to provide.

Differential Revision: https://phabricator.services.mozilla.com/D17422

--HG--
extra : moz-landing-system : lando

dom/svg/DOMSVGAnimatedLengthList.cpp

@@ -6,12 +6,12 @@
 
 #include "DOMSVGAnimatedLengthList.h"
 
-#include "nsCOMPtr.h"
 #include "DOMSVGLengthList.h"
 #include "SVGAnimatedLengthList.h"
 #include "SVGAttrTearoffTable.h"
 #include "mozilla/dom/SVGAnimatedLengthListBinding.h"
 #include "mozilla/dom/SVGElement.h"
+#include "mozilla/RefPtr.h"
 
 // See the architecture comment in this file's header.
 

dom/svg/DOMSVGAnimatedLengthList.h

@@ -7,10 +7,10 @@
 #ifndef MOZILLA_DOMSVGANIMATEDLENGTHLIST_H__
 #define MOZILLA_DOMSVGANIMATEDLENGTHLIST_H__
 
-#include "nsCOMPtr.h"
 #include "nsCycleCollectionParticipant.h"
 #include "SVGElement.h"
 #include "mozilla/Attributes.h"
+#include "mozilla/RefPtr.h"
 
 namespace mozilla {
 

dom/svg/DOMSVGAnimatedNumberList.cpp

@@ -6,12 +6,12 @@
 
 #include "DOMSVGAnimatedNumberList.h"
 
-#include "nsCOMPtr.h"
 #include "DOMSVGNumberList.h"
 #include "SVGAnimatedNumberList.h"
 #include "SVGAttrTearoffTable.h"
 #include "mozilla/dom/SVGAnimatedNumberListBinding.h"
 #include "mozilla/dom/SVGElement.h"
+#include "mozilla/RefPtr.h"
 
 // See the architecture comment in this file's header.
 

dom/svg/DOMSVGAnimatedNumberList.h

@@ -7,11 +7,11 @@
 #ifndef MOZILLA_DOMSVGANIMATEDNUMBERLIST_H__
 #define MOZILLA_DOMSVGANIMATEDNUMBERLIST_H__
 
-#include "nsCOMPtr.h"
 #include "nsCycleCollectionParticipant.h"
 #include "SVGElement.h"
 #include "nsWrapperCache.h"
 #include "mozilla/Attributes.h"
+#include "mozilla/RefPtr.h"
 
 namespace mozilla {
 

dom/svg/DOMSVGAnimatedTransformList.h

@@ -7,12 +7,11 @@
 #ifndef mozilla_dom_SVGAnimatedTransformList_h
 #define mozilla_dom_SVGAnimatedTransformList_h
 
-#include "nsAutoPtr.h"
-#include "nsCOMPtr.h"
 #include "nsCycleCollectionParticipant.h"
 #include "SVGElement.h"
 #include "nsWrapperCache.h"
 #include "mozilla/Attributes.h"
+#include "mozilla/RefPtr.h"
 
 namespace mozilla {
 

dom/svg/DOMSVGNumber.h

@@ -8,10 +8,12 @@
 #define MOZILLA_DOMSVGNUMBER_H__
 
 #include "DOMSVGNumberList.h"
+#include "nsCOMPtr.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsTArray.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/ErrorResult.h"
+#include "mozilla/RefPtr.h"
 #include "nsWrapperCache.h"
 
 #define MOZ_SVG_LIST_INDEX_BIT_COUNT 27  // supports > 134 million list items

dom/svg/DOMSVGNumberList.cpp

@@ -10,8 +10,8 @@
 #include "DOMSVGNumber.h"
 #include "nsError.h"
 #include "SVGAnimatedNumberList.h"
-#include "nsCOMPtr.h"
 #include "mozilla/dom/SVGNumberListBinding.h"
+#include "mozilla/RefPtr.h"
 #include <algorithm>
 
 // See the comment in this file's header.

dom/svg/DOMSVGNumberList.h

@@ -14,6 +14,7 @@
 #include "SVGNumberList.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/ErrorResult.h"
+#include "mozilla/RefPtr.h"
 
 namespace mozilla {
 

dom/svg/DOMSVGPathSegList.cpp

@@ -6,7 +6,6 @@
 
 #include "DOMSVGPathSegList.h"
 
-#include "nsCOMPtr.h"
 #include "DOMSVGPathSeg.h"
 #include "nsError.h"
 #include "SVGAnimatedPathSegList.h"
@@ -14,6 +13,7 @@
 #include "SVGPathSegUtils.h"
 #include "mozilla/dom/SVGElement.h"
 #include "mozilla/dom/SVGPathSegListBinding.h"
+#include "mozilla/RefPtr.h"
 
 using namespace mozilla::dom;
 

dom/svg/DOMSVGPathSegList.h

@@ -7,7 +7,6 @@
 #ifndef MOZILLA_DOMSVGPATHSEGLIST_H__
 #define MOZILLA_DOMSVGPATHSEGLIST_H__
 
-#include "nsCOMPtr.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsDebug.h"
 #include "SVGElement.h"
@@ -15,6 +14,7 @@
 #include "SVGPathData.h"  // IWYU pragma: keep
 #include "mozilla/Attributes.h"
 #include "mozilla/ErrorResult.h"
+#include "mozilla/RefPtr.h"
 
 namespace mozilla {
 

dom/svg/DOMSVGPoint.cpp

@@ -5,10 +5,12 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "DOMSVGPoint.h"
+
 #include "DOMSVGPointList.h"
 #include "SVGPoint.h"
 #include "gfx2DGlue.h"
 #include "SVGElement.h"
+#include "nsCOMPtr.h"
 #include "nsError.h"
 #include "mozilla/dom/SVGMatrix.h"
 

dom/svg/DOMSVGPointList.h

@@ -7,7 +7,6 @@
 #ifndef MOZILLA_DOMSVGPOINTLIST_H__
 #define MOZILLA_DOMSVGPOINTLIST_H__
 
-#include "nsCOMPtr.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsDebug.h"
 #include "SVGElement.h"
@@ -15,6 +14,7 @@
 #include "SVGPointList.h"  // IWYU pragma: keep
 #include "mozilla/Attributes.h"
 #include "mozilla/ErrorResult.h"
+#include "mozilla/RefPtr.h"
 
 namespace mozilla {
 

dom/svg/DOMSVGStringList.h

@@ -7,10 +7,10 @@
 #ifndef MOZILLA_DOMSVGSTRINGLIST_H__
 #define MOZILLA_DOMSVGSTRINGLIST_H__
 
-#include "nsCOMPtr.h"
 #include "nsCycleCollectionParticipant.h"
 #include "SVGElement.h"
 #include "mozilla/Attributes.h"
+#include "mozilla/RefPtr.h"
 
 namespace mozilla {
 

dom/svg/SVGAngle.h

@@ -7,9 +7,9 @@
 #ifndef __NS_SVGANGLE_H__
 #define __NS_SVGANGLE_H__
 
-#include "nsCOMPtr.h"
 #include "nsError.h"
 #include "nsISMILAttr.h"
+#include "mozilla/AlreadyAddRefed.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/dom/SVGAngleBinding.h"
 #include "mozilla/UniquePtr.h"

dom/svg/SVGBoolean.h

@@ -7,9 +7,9 @@
 #ifndef __NS_SVGBOOLEAN_H__
 #define __NS_SVGBOOLEAN_H__
 
-#include "nsCOMPtr.h"
 #include "nsError.h"
 #include "nsISMILAttr.h"
+#include "mozilla/AlreadyAddRefed.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/UniquePtr.h"
 

dom/svg/SVGElement.h

@@ -13,6 +13,7 @@
 */
 
 #include "mozilla/Attributes.h"
+#include "mozilla/RefPtr.h"
 #include "mozilla/SVGContentUtils.h"
 #include "mozilla/dom/DOMRect.h"
 #include "mozilla/dom/Element.h"
@@ -20,7 +21,6 @@
 #include "mozilla/gfx/MatrixFwd.h"
 #include "nsAutoPtr.h"
 #include "nsChangeHint.h"
-#include "nsCOMPtr.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsError.h"
 #include "nsISupportsImpl.h"

dom/svg/SVGFilterElement.cpp

@@ -7,7 +7,7 @@
 #include "mozilla/dom/SVGFilterElement.h"
 
 #include "nsGkAtoms.h"
-#include "nsCOMPtr.h"
+#include "mozilla/AlreadyAddRefed.h"
 #include "mozilla/ArrayUtils.h"
 #include "mozilla/dom/SVGFilterElementBinding.h"
 #include "mozilla/dom/SVGLengthBinding.h"

dom/svg/SVGForeignObjectElement.cpp

@@ -6,7 +6,7 @@
 
 #include "mozilla/dom/SVGForeignObjectElement.h"
 
-#include "nsCOMPtr.h"
+#include "mozilla/AlreadyAddRefed.h"
 #include "mozilla/ArrayUtils.h"
 #include "mozilla/dom/SVGDocument.h"
 #include "mozilla/dom/SVGForeignObjectElementBinding.h"

dom/svg/SVGGeometryElement.cpp

@@ -6,10 +6,12 @@
 
 #include "SVGGeometryElement.h"
 
+#include "nsCOMPtr.h"
 #include "DOMSVGPoint.h"
 #include "gfxPlatform.h"
 #include "mozilla/gfx/2D.h"
 #include "mozilla/dom/SVGLengthBinding.h"
+#include "mozilla/RefPtr.h"
 #include "nsComputedDOMStyle.h"
 #include "nsSVGUtils.h"
 #include "nsSVGLength2.h"

dom/svg/SVGGradientElement.cpp

@@ -6,6 +6,7 @@
 
 #include "mozilla/dom/SVGGradientElement.h"
 
+#include "mozilla/AlreadyAddRefed.h"
 #include "mozilla/ArrayUtils.h"
 #include "mozilla/dom/SVGElement.h"
 #include "mozilla/dom/SVGGradientElementBinding.h"
@@ -14,7 +15,6 @@
 #include "mozilla/dom/SVGRadialGradientElementBinding.h"
 #include "mozilla/dom/SVGUnitTypesBinding.h"
 #include "DOMSVGAnimatedTransformList.h"
-#include "nsCOMPtr.h"
 #include "nsGkAtoms.h"
 
 NS_IMPL_NS_NEW_SVG_ELEMENT(LinearGradient)

dom/svg/SVGMarkerElement.cpp

@@ -7,7 +7,6 @@
 #include "mozilla/dom/SVGMarkerElement.h"
 
 #include "nsGkAtoms.h"
-#include "nsCOMPtr.h"
 #include "SVGAnimatedPreserveAspectRatio.h"
 #include "nsError.h"
 #include "mozilla/ArrayUtils.h"
@@ -17,6 +16,7 @@
 #include "mozilla/dom/SVGMarkerElementBinding.h"
 #include "mozilla/gfx/Matrix.h"
 #include "mozilla/FloatingPoint.h"
+#include "mozilla/RefPtr.h"
 #include "SVGContentUtils.h"
 
 using namespace mozilla::gfx;

dom/svg/SVGMaskElement.cpp

@@ -6,8 +6,8 @@
 
 #include "mozilla/dom/SVGMaskElement.h"
 
-#include "nsCOMPtr.h"
 #include "nsGkAtoms.h"
+#include "mozilla/AlreadyAddRefed.h"
 #include "mozilla/ArrayUtils.h"
 #include "mozilla/dom/SVGLengthBinding.h"
 #include "mozilla/dom/SVGMaskElementBinding.h"

dom/svg/SVGPathElement.cpp

@@ -15,7 +15,6 @@
 #include "mozilla/dom/SVGPathElementBinding.h"
 #include "mozilla/gfx/2D.h"
 #include "mozilla/RefPtr.h"
-#include "nsCOMPtr.h"
 #include "nsComputedDOMStyle.h"
 #include "nsGkAtoms.h"
 #include "nsStyleConsts.h"

dom/svg/SVGPatternElement.cpp

@@ -6,12 +6,12 @@
 
 #include "mozilla/dom/SVGPatternElement.h"
 
+#include "mozilla/AlreadyAddRefed.h"
 #include "mozilla/ArrayUtils.h"
 #include "mozilla/dom/SVGLengthBinding.h"
 #include "mozilla/dom/SVGPatternElementBinding.h"
 #include "mozilla/dom/SVGUnitTypesBinding.h"
 #include "DOMSVGAnimatedTransformList.h"
-#include "nsCOMPtr.h"
 #include "nsGkAtoms.h"
 
 NS_IMPL_NS_NEW_SVG_ELEMENT(Pattern)

dom/svg/SVGRect.h

@@ -9,6 +9,7 @@
 
 #include "mozilla/dom/SVGIRect.h"
 #include "mozilla/gfx/Rect.h"
+#include "nsCOMPtr.h"
 #include "SVGElement.h"
 
 ////////////////////////////////////////////////////////////////////////

dom/svg/SVGScriptElement.h

@@ -8,8 +8,8 @@
 #define mozilla_dom_SVGScriptElement_h
 
 #include "SVGElement.h"
-#include "nsCOMPtr.h"
 #include "SVGString.h"
+#include "mozilla/AlreadyAddRefed.h"
 #include "mozilla/dom/ScriptElement.h"
 
 nsresult NS_NewSVGScriptElement(

dom/svg/SVGStyleElement.cpp

@@ -7,8 +7,9 @@
 #include "mozilla/dom/SVGStyleElement.h"
 
 #include "mozilla/dom/Element.h"
-#include "nsContentUtils.h"
 #include "mozilla/dom/SVGStyleElementBinding.h"
+#include "nsCOMPtr.h"
+#include "nsContentUtils.h"
 
 NS_IMPL_NS_NEW_SVG_ELEMENT(Style)
 

dom/svg/SVGSwitchElement.h

@@ -8,6 +8,7 @@
 #define mozilla_dom_SVGSwitchElement_h
 
 #include "mozilla/dom/SVGGraphicsElement.h"
+#include "nsCOMPtr.h"
 
 class nsSVGSwitchFrame;
 

dom/svg/SVGTests.h

@@ -7,8 +7,8 @@
 #ifndef mozilla_dom_SVGTests_h
 #define mozilla_dom_SVGTests_h
 
-#include "nsCOMPtr.h"
 #include "nsStringFwd.h"
+#include "mozilla/AlreadyAddRefed.h"
 #include "mozilla/SVGStringList.h"
 
 class nsAttrValue;

dom/svg/SVGUseElement.h

@@ -9,8 +9,10 @@
 
 #include "mozilla/dom/FromParser.h"
 #include "mozilla/dom/IDTracker.h"
-#include "nsStubMutationObserver.h"
 #include "mozilla/dom/SVGGraphicsElement.h"
+#include "mozilla/RefPtr.h"
+#include "nsCOMPtr.h"
+#include "nsStubMutationObserver.h"
 #include "nsSVGLength2.h"
 #include "SVGString.h"
 #include "nsTArray.h"

dom/svg/SVGViewportElement.cpp

@@ -7,6 +7,7 @@
 #include "mozilla/dom/SVGViewportElement.h"
 
 #include <stdint.h>
+#include "mozilla/AlreadyAddRefed.h"
 #include "mozilla/ArrayUtils.h"
 #include "mozilla/ContentEvents.h"
 #include "mozilla/EventDispatcher.h"
@@ -20,7 +21,6 @@
 
 #include "DOMSVGLength.h"
 #include "DOMSVGPoint.h"
-#include "nsCOMPtr.h"
 #include "nsContentUtils.h"
 #include "nsFrameSelection.h"
 #include "nsError.h"