Bug 1648463 - Move SVGForeignObjectFrame SVGImageFrame and SVGUseFram…

…e to mozilla namespace r=dholbert,jgilbert

stop exposing SVGImageListener as only SVGImageFrame uses it.

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

dom/base/nsImageLoadingContent.cpp

@@ -13,8 +13,6 @@
 #include "nsImageLoadingContent.h"
 #include "nsError.h"
 #include "nsIContent.h"
-#include "mozilla/dom/BindContext.h"
-#include "mozilla/dom/Document.h"
 #include "nsIScriptGlobalObject.h"
 #include "nsServiceManagerUtils.h"
 #include "nsContentList.h"
@@ -26,7 +24,6 @@
 #include "nsThreadUtils.h"
 #include "nsNetUtil.h"
 #include "nsImageFrame.h"
-#include "nsSVGImageFrame.h"
 
 #include "nsIChannel.h"
 #include "nsIStreamListener.h"
@@ -36,22 +33,25 @@
 #include "nsContentUtils.h"
 #include "nsLayoutUtils.h"
 #include "nsIContentPolicy.h"
-#include "SVGObserverUtils.h"
 
 #include "mozAutoDocUpdate.h"
 #include "mozilla/AsyncEventDispatcher.h"
 #include "mozilla/AutoRestore.h"
 #include "mozilla/CycleCollectedJSContext.h"
 #include "mozilla/EventStateManager.h"
 #include "mozilla/EventStates.h"
+#include "mozilla/Preferences.h"
+#include "mozilla/PresShell.h"
+#include "mozilla/StaticPrefs_image.h"
+#include "mozilla/SVGImageFrame.h"
+#include "mozilla/SVGObserverUtils.h"
+#include "mozilla/dom/BindContext.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/dom/Element.h"
 #include "mozilla/dom/HTMLImageElement.h"
 #include "mozilla/dom/ImageTracker.h"
 #include "mozilla/dom/ScriptSettings.h"
 #include "mozilla/net/UrlClassifierFeatureFactory.h"
-#include "mozilla/Preferences.h"
-#include "mozilla/PresShell.h"
-#include "mozilla/StaticPrefs_image.h"
 
 #ifdef LoadImage
 // Undefine LoadImage to prevent naming conflict with Windows.
@@ -524,7 +524,7 @@ void nsImageLoadingContent::MaybeForceSyncDecoding(
     bool aPrepareNextRequest, nsIFrame* aFrame /* = nullptr */) {
   nsIFrame* frame = aFrame ? aFrame : GetOurPrimaryFrame();
   nsImageFrame* imageFrame = do_QueryFrame(frame);
-  nsSVGImageFrame* svgImageFrame = do_QueryFrame(frame);
+  SVGImageFrame* svgImageFrame = do_QueryFrame(frame);
   if (!imageFrame && !svgImageFrame) {
     return;
   }

dom/canvas/CanvasRenderingContext2D.cpp

@@ -9,16 +9,16 @@
 #include "nsXULElement.h"
 
 #include "nsMathUtils.h"
-#include "SVGImageContext.h"
 
 #include "nsContentUtils.h"
 
 #include "mozilla/PresShell.h"
 #include "mozilla/PresShellInlines.h"
+#include "mozilla/SVGImageContext.h"
+#include "mozilla/SVGObserverUtils.h"
 #include "mozilla/dom/Document.h"
 #include "mozilla/dom/HTMLCanvasElement.h"
 #include "mozilla/dom/GeneratePlaceholderCanvasData.h"
-#include "SVGObserverUtils.h"
 #include "nsPresContext.h"
 
 #include "nsIInterfaceRequestorUtils.h"

dom/canvas/CanvasRenderingContext2D.h

@@ -5,29 +5,29 @@
 #ifndef CanvasRenderingContext2D_h
 #define CanvasRenderingContext2D_h
 
-#include "mozilla/Attributes.h"
 #include <vector>
-#include "nsICanvasRenderingContextInternal.h"
-#include "mozilla/RefPtr.h"
-#include "nsColor.h"
-#include "mozilla/dom/HTMLCanvasElement.h"
-#include "mozilla/dom/HTMLVideoElement.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/dom/BasicRenderingContext2D.h"
 #include "mozilla/dom/CanvasGradient.h"
-#include "mozilla/dom/CanvasRenderingContext2DBinding.h"
 #include "mozilla/dom/CanvasPattern.h"
+#include "mozilla/dom/CanvasRenderingContext2DBinding.h"
+#include "mozilla/dom/HTMLCanvasElement.h"
+#include "mozilla/dom/HTMLVideoElement.h"
 #include "mozilla/gfx/Rect.h"
 #include "mozilla/gfx/2D.h"
+#include "mozilla/Attributes.h"
+#include "mozilla/EnumeratedArray.h"
+#include "mozilla/ErrorResult.h"
 #include "mozilla/PresShell.h"
+#include "mozilla/RefPtr.h"
+#include "mozilla/SVGObserverUtils.h"
 #include "mozilla/UniquePtr.h"
-#include "gfx2DGlue.h"
-#include "nsLayoutUtils.h"
-#include "mozilla/EnumeratedArray.h"
 #include "FilterSupport.h"
-#include "SVGObserverUtils.h"
+#include "gfx2DGlue.h"
 #include "Layers.h"
+#include "nsICanvasRenderingContextInternal.h"
 #include "nsBidi.h"
+#include "nsColor.h"
+#include "nsLayoutUtils.h"
 
 class gfxFontGroup;
 class nsGlobalWindowInner;

dom/canvas/WebGLContext.cpp

@@ -39,6 +39,7 @@
 #include "mozilla/ScopeExit.h"
 #include "mozilla/Services.h"
 #include "mozilla/StaticPrefs_webgl.h"
+#include "mozilla/SVGObserverUtils.h"
 #include "mozilla/Telemetry.h"
 #include "nsContentUtils.h"
 #include "nsDisplayList.h"
@@ -48,7 +49,6 @@
 #include "nsIWidget.h"
 #include "nsServiceManagerUtils.h"
 #include "SharedSurfaceGL.h"
-#include "SVGObserverUtils.h"
 #include "prenv.h"
 #include "ScopedGLHelpers.h"
 #include "VRManagerChild.h"

dom/html/HTMLMediaElement.cpp

@@ -41,7 +41,6 @@
 #include "MediaStreamWindowCapturer.h"
 #include "MediaTrack.h"
 #include "MediaTrackList.h"
-#include "SVGObserverUtils.h"
 #include "TimeRanges.h"
 #include "VideoFrameContainer.h"
 #include "VideoOutput.h"
@@ -59,6 +58,7 @@
 #include "mozilla/PresShell.h"
 #include "mozilla/Sprintf.h"
 #include "mozilla/StaticPrefs_media.h"
+#include "mozilla/SVGObserverUtils.h"
 #include "mozilla/Telemetry.h"
 #include "mozilla/dom/AudioTrack.h"
 #include "mozilla/dom/AudioTrackList.h"

dom/svg/SVGForeignObjectElement.h

@@ -14,13 +14,13 @@
 nsresult NS_NewSVGForeignObjectElement(
     nsIContent** aResult, already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo);
 
-class nsSVGForeignObjectFrame;
-
 namespace mozilla {
+class SVGForeignObjectFrame;
+
 namespace dom {
 
 class SVGForeignObjectElement final : public SVGGraphicsElement {
-  friend class ::nsSVGForeignObjectFrame;
+  friend class mozilla::SVGForeignObjectFrame;
 
  protected:
   friend nsresult(::NS_NewSVGForeignObjectElement(

dom/svg/SVGGeometryProperty.h

@@ -7,13 +7,13 @@
 #ifndef mozilla_dom_SVGGeometryProperty_SVGGeometryProperty_h
 #define mozilla_dom_SVGGeometryProperty_SVGGeometryProperty_h
 
+#include "mozilla/SVGImageFrame.h"
 #include "mozilla/dom/SVGElement.h"
 #include "ComputedStyle.h"
 #include "SVGAnimatedLength.h"
 #include "nsComputedDOMStyle.h"
 #include "nsGkAtoms.h"
 #include "nsIFrame.h"
-#include "nsSVGImageFrame.h"
 #include <type_traits>
 
 namespace mozilla {
@@ -126,7 +126,7 @@ float ResolveImpl(ComputedStyle const& aStyle, SVGElement* aElement,
     // specified in:
     // https://svgwg.org/svg2-draft/embedded.html#ImageElement
 
-    nsSVGImageFrame* imgf = do_QueryFrame(aElement->GetPrimaryFrame());
+    SVGImageFrame* imgf = do_QueryFrame(aElement->GetPrimaryFrame());
     MOZ_ASSERT(imgf);
 
     using Other = typename Tag::CounterPart;

dom/svg/SVGImageElement.cpp

@@ -265,7 +265,7 @@ bool SVGImageElement::GetGeometryBounds(
 
 already_AddRefed<Path> SVGImageElement::BuildPath(PathBuilder* aBuilder) {
   // To get bound, the faster method GetGeometryBounds() should already return
-  // success. For render and hittest, nsSVGImageFrame should have its own
+  // success. For render and hittest, SVGImageFrame should have its own
   // implementation that doesn't need to build path for an image.
   MOZ_ASSERT_UNREACHABLE(
       "There is no reason to call BuildPath for SVGImageElement");

dom/svg/SVGImageElement.h

@@ -16,17 +16,17 @@
 nsresult NS_NewSVGImageElement(
     nsIContent** aResult, already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo);
 
-class nsSVGImageFrame;
-
 namespace mozilla {
+class SVGImageFrame;
+
 namespace dom {
 class DOMSVGAnimatedPreserveAspectRatio;
 
 typedef SVGGeometryElement SVGImageElementBase;
 
 class SVGImageElement : public SVGImageElementBase,
                         public nsImageLoadingContent {
-  friend class ::nsSVGImageFrame;
+  friend class mozilla::SVGImageFrame;
 
  protected:
   explicit SVGImageElement(

dom/svg/SVGUseElement.cpp

@@ -8,17 +8,17 @@
 
 #include "mozilla/ArrayUtils.h"
 #include "mozilla/ErrorResult.h"
+#include "mozilla/SVGObserverUtils.h"
+#include "mozilla/SVGUseFrame.h"
+#include "mozilla/URLExtraData.h"
+#include "mozilla/dom/Document.h"
+#include "mozilla/dom/Element.h"
 #include "mozilla/dom/SVGLengthBinding.h"
+#include "mozilla/dom/SVGSVGElement.h"
 #include "mozilla/dom/SVGUseElementBinding.h"
 #include "nsGkAtoms.h"
-#include "mozilla/dom/SVGSVGElement.h"
-#include "mozilla/dom/Document.h"
-#include "mozilla/dom/Element.h"
 #include "nsContentUtils.h"
 #include "nsIURI.h"
-#include "mozilla/URLExtraData.h"
-#include "SVGObserverUtils.h"
-#include "nsSVGUseFrame.h"
 
 NS_IMPL_NS_NEW_SVG_ELEMENT(Use)
 
@@ -527,15 +527,15 @@ SVGElement::StringAttributesInfo SVGUseElement::GetStringInfo() {
                               ArrayLength(sStringInfo));
 }
 
-nsSVGUseFrame* SVGUseElement::GetFrame() const {
+SVGUseFrame* SVGUseElement::GetFrame() const {
   nsIFrame* frame = GetPrimaryFrame();
   // We might be a plain nsSVGContainerFrame if we didn't pass the conditional
   // processing checks.
   if (!frame || !frame->IsSVGUseFrame()) {
     MOZ_ASSERT_IF(frame, frame->Type() == LayoutFrameType::None);
     return nullptr;
   }
-  return static_cast<nsSVGUseFrame*>(frame);
+  return static_cast<SVGUseFrame*>(frame);
 }
 
 //----------------------------------------------------------------------

dom/svg/SVGUseElement.h

@@ -18,7 +18,6 @@
 #include "nsTArray.h"
 
 class nsIContent;
-class nsSVGUseFrame;
 
 nsresult NS_NewSVGSVGElement(
     nsIContent** aResult, already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo,
@@ -27,6 +26,7 @@ nsresult NS_NewSVGUseElement(
     nsIContent** aResult, already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo);
 
 namespace mozilla {
+class SVGUseFrame;
 struct URLExtraData;
 
 namespace dom {
@@ -35,7 +35,7 @@ typedef SVGGraphicsElement SVGUseElementBase;
 
 class SVGUseElement final : public SVGUseElementBase,
                             public nsStubMutationObserver {
-  friend class ::nsSVGUseFrame;
+  friend class mozilla::SVGUseFrame;
 
  protected:
   friend nsresult(::NS_NewSVGUseElement(
@@ -88,7 +88,7 @@ class SVGUseElement final : public SVGUseElementBase,
   // referenced element.
   void UpdateShadowTree();
 
-  // Shared code between AfterSetAttr and nsSVGUseFrame::AttributeChanged.
+  // Shared code between AfterSetAttr and SVGUseFrame::AttributeChanged.
   //
   // This is needed because SMIL doesn't go through AfterSetAttr unfortunately.
   void ProcessAttributeChange(int32_t aNamespaceID, nsAtom* aAttribute);
@@ -137,7 +137,7 @@ class SVGUseElement final : public SVGUseElementBase,
     SVGUseElement* mOwningUseElement;
   };
 
-  nsSVGUseFrame* GetFrame() const;
+  SVGUseFrame* GetFrame() const;
 
   virtual LengthAttributesInfo GetLengthInfo() override;
   virtual StringAttributesInfo GetStringInfo() override;

dom/svg/SVGViewportElement.h

@@ -8,15 +8,15 @@
 #define mozilla_dom_SVGViewportElement_h
 
 #include "mozilla/Attributes.h"
-#include "mozilla/dom/FromParser.h"
+#include "mozilla/SVGImageContext.h"
 #include "mozilla/UniquePtr.h"
+#include "mozilla/dom/FromParser.h"
 #include "nsIContentInlines.h"
 #include "SVGAnimatedEnumeration.h"
 #include "SVGAnimatedLength.h"
 #include "SVGAnimatedPreserveAspectRatio.h"
 #include "SVGAnimatedViewBox.h"
 #include "SVGGraphicsElement.h"
-#include "SVGImageContext.h"
 #include "nsISVGPoint.h"
 #include "SVGPreserveAspectRatio.h"
 

image/SurfaceCache.h

@@ -11,18 +11,18 @@
 #ifndef mozilla_image_SurfaceCache_h
 #define mozilla_image_SurfaceCache_h
 
-#include "mozilla/Maybe.h"  // for Maybe
-#include "mozilla/NotNull.h"
-#include "mozilla/MemoryReporting.h"  // for MallocSizeOf
 #include "mozilla/HashFunctions.h"    // for HashGeneric and AddToHash
+#include "mozilla/Maybe.h"            // for Maybe
+#include "mozilla/MemoryReporting.h"  // for MallocSizeOf
+#include "mozilla/NotNull.h"
+#include "mozilla/SVGImageContext.h"  // for SVGImageContext
+#include "mozilla/gfx/2D.h"           // for SourceSurface
+#include "mozilla/gfx/Point.h"        // for mozilla::gfx::IntSize
 #include "gfx2DGlue.h"
-#include "gfxPoint.h"           // for gfxSize
-#include "nsCOMPtr.h"           // for already_AddRefed
-#include "mozilla/gfx/Point.h"  // for mozilla::gfx::IntSize
-#include "mozilla/gfx/2D.h"     // for SourceSurface
+#include "gfxPoint.h"  // for gfxSize
+#include "nsCOMPtr.h"  // for already_AddRefed
 #include "PlaybackType.h"
 #include "SurfaceFlags.h"
-#include "SVGImageContext.h"  // for SVGImageContext
 
 namespace mozilla {
 namespace image {

image/test/mochitest/test_svg_animatedGIF.html

@@ -35,7 +35,7 @@
 <pre id="test">
 <script type="text/javascript">
 
-/** Test for Bug 666446 nsSVGImageFrame/RasterImage**/
+/** Test for Bug 666446 SVGImageFrame/RasterImage**/
 
 const FAILURE_TIMEOUT = 120000; // Fail early after 120 seconds (2 minutes)