From 0e4feb75d3a5103fbd6d02da882acb030decd792 Mon Sep 17 00:00:00 2001 From: Jonathan Watt Date: Wed, 30 Aug 2017 14:14:46 +0100 Subject: [PATCH] Bug 1401356, part 1 - Rename nsSVGEffects.h/.cpp to SVGObserverUtils.h/.cpp. r=longsonr --HG-- rename : layout/svg/nsSVGEffects.cpp => layout/svg/SVGObserverUtils.cpp rename : layout/svg/nsSVGEffects.h => layout/svg/SVGObserverUtils.h --- dom/base/nsImageLoadingContent.cpp | 2 +- dom/canvas/CanvasRenderingContext2D.cpp | 2 +- dom/canvas/CanvasRenderingContext2D.h | 2 +- dom/canvas/WebGLContext.cpp | 2 +- dom/media/VideoFrameContainer.cpp | 2 +- dom/svg/SVGUseElement.cpp | 2 +- image/SVGDocumentWrapper.cpp | 2 +- image/VectorImage.cpp | 2 +- image/moz.build | 2 +- layout/base/GeckoRestyleManager.cpp | 2 +- layout/base/PresShell.cpp | 2 +- layout/generic/nsFrame.cpp | 2 +- layout/painting/nsCSSRendering.cpp | 2 +- layout/painting/nsDisplayList.cpp | 2 +- layout/painting/nsImageRenderer.cpp | 2 +- layout/style/ImageLoader.cpp | 2 +- layout/svg/SVGContextPaint.cpp | 2 +- layout/svg/SVGFEContainerFrame.cpp | 2 +- layout/svg/SVGFEImageFrame.cpp | 2 +- layout/svg/SVGFELeafFrame.cpp | 2 +- layout/svg/SVGFEUnstyledLeafFrame.cpp | 2 +- layout/svg/SVGGeometryFrame.cpp | 2 +- layout/svg/{nsSVGEffects.cpp => SVGObserverUtils.cpp} | 2 +- layout/svg/{nsSVGEffects.h => SVGObserverUtils.h} | 0 layout/svg/SVGTextFrame.cpp | 2 +- layout/svg/moz.build | 4 ++-- layout/svg/nsSVGClipPathFrame.cpp | 2 +- layout/svg/nsSVGContainerFrame.cpp | 2 +- layout/svg/nsSVGFilterFrame.cpp | 2 +- layout/svg/nsSVGFilterInstance.cpp | 2 +- layout/svg/nsSVGForeignObjectFrame.cpp | 2 +- layout/svg/nsSVGGradientFrame.cpp | 2 +- layout/svg/nsSVGImageFrame.cpp | 2 +- layout/svg/nsSVGImageFrame.h | 2 +- layout/svg/nsSVGIntegrationUtils.cpp | 2 +- layout/svg/nsSVGMarkerFrame.cpp | 2 +- layout/svg/nsSVGMaskFrame.cpp | 2 +- layout/svg/nsSVGPatternFrame.cpp | 2 +- layout/svg/nsSVGStopFrame.cpp | 2 +- layout/svg/nsSVGSwitchFrame.cpp | 2 +- layout/svg/nsSVGUseFrame.cpp | 2 +- layout/svg/nsSVGUtils.cpp | 2 +- 42 files changed, 42 insertions(+), 42 deletions(-) rename layout/svg/{nsSVGEffects.cpp => SVGObserverUtils.cpp} (99%) rename layout/svg/{nsSVGEffects.h => SVGObserverUtils.h} (100%) diff --git a/dom/base/nsImageLoadingContent.cpp b/dom/base/nsImageLoadingContent.cpp index 6cf816932291..a869dfde7e44 100644 --- a/dom/base/nsImageLoadingContent.cpp +++ b/dom/base/nsImageLoadingContent.cpp @@ -39,7 +39,7 @@ #include "nsContentUtils.h" #include "nsLayoutUtils.h" #include "nsIContentPolicy.h" -#include "nsSVGEffects.h" +#include "SVGObserverUtils.h" #include "gfxPrefs.h" diff --git a/dom/canvas/CanvasRenderingContext2D.cpp b/dom/canvas/CanvasRenderingContext2D.cpp index c0b1d23cf607..e3d0ed0eba88 100644 --- a/dom/canvas/CanvasRenderingContext2D.cpp +++ b/dom/canvas/CanvasRenderingContext2D.cpp @@ -17,7 +17,7 @@ #include "nsIDocument.h" #include "mozilla/dom/HTMLCanvasElement.h" -#include "nsSVGEffects.h" +#include "SVGObserverUtils.h" #include "nsPresContext.h" #include "nsIPresShell.h" diff --git a/dom/canvas/CanvasRenderingContext2D.h b/dom/canvas/CanvasRenderingContext2D.h index 0ab551efd6c4..a177d0b6ff7c 100644 --- a/dom/canvas/CanvasRenderingContext2D.h +++ b/dom/canvas/CanvasRenderingContext2D.h @@ -27,7 +27,7 @@ #include "nsLayoutUtils.h" #include "mozilla/EnumeratedArray.h" #include "FilterSupport.h" -#include "nsSVGEffects.h" +#include "SVGObserverUtils.h" #include "Layers.h" #include "nsBidi.h" diff --git a/dom/canvas/WebGLContext.cpp b/dom/canvas/WebGLContext.cpp index 1fb8f8b5afc3..c663856c4967 100644 --- a/dom/canvas/WebGLContext.cpp +++ b/dom/canvas/WebGLContext.cpp @@ -45,7 +45,7 @@ #include "nsIWidget.h" #include "nsIXPConnect.h" #include "nsServiceManagerUtils.h" -#include "nsSVGEffects.h" +#include "SVGObserverUtils.h" #include "prenv.h" #include "ScopedGLHelpers.h" #include "VRManagerChild.h" diff --git a/dom/media/VideoFrameContainer.cpp b/dom/media/VideoFrameContainer.cpp index 2bdaa808d0a8..f1145edf06ef 100644 --- a/dom/media/VideoFrameContainer.cpp +++ b/dom/media/VideoFrameContainer.cpp @@ -11,7 +11,7 @@ #include "nsIFrame.h" #include "nsDisplayList.h" -#include "nsSVGEffects.h" +#include "SVGObserverUtils.h" using namespace mozilla::layers; diff --git a/dom/svg/SVGUseElement.cpp b/dom/svg/SVGUseElement.cpp index 233815b69ddf..837ec10ce81a 100644 --- a/dom/svg/SVGUseElement.cpp +++ b/dom/svg/SVGUseElement.cpp @@ -17,7 +17,7 @@ #include "nsContentUtils.h" #include "nsIURI.h" #include "mozilla/URLExtraData.h" -#include "nsSVGEffects.h" +#include "SVGObserverUtils.h" #include "nsSVGUseFrame.h" NS_IMPL_NS_NEW_NAMESPACED_SVG_ELEMENT(Use) diff --git a/image/SVGDocumentWrapper.cpp b/image/SVGDocumentWrapper.cpp index 3b6a2600417c..a87154abfc2a 100644 --- a/image/SVGDocumentWrapper.cpp +++ b/image/SVGDocumentWrapper.cpp @@ -25,7 +25,7 @@ #include "nsSMILAnimationController.h" #include "nsServiceManagerUtils.h" #include "mozilla/dom/SVGSVGElement.h" -#include "nsSVGEffects.h" +#include "SVGObserverUtils.h" #include "mozilla/dom/SVGAnimatedLength.h" #include "nsMimeTypes.h" #include "DOMSVGLength.h" diff --git a/image/VectorImage.cpp b/image/VectorImage.cpp index 3328cbbdfd2a..83b375cb157b 100644 --- a/image/VectorImage.cpp +++ b/image/VectorImage.cpp @@ -24,7 +24,7 @@ #include "nsRect.h" #include "nsString.h" #include "nsStubDocumentObserver.h" -#include "nsSVGEffects.h" // for nsSVGRenderingObserver +#include "SVGObserverUtils.h" // for nsSVGRenderingObserver #include "nsWindowSizes.h" #include "ImageRegion.h" #include "ISurfaceProvider.h" diff --git a/image/moz.build b/image/moz.build index 288aac2eec97..2e34a6ce8fa2 100644 --- a/image/moz.build +++ b/image/moz.build @@ -101,7 +101,7 @@ LOCAL_INCLUDES += [ '/dom/svg', # We need to instantiate the decoders '/image/decoders', - # Because VectorImage.cpp includes nsSVGUtils.h and nsSVGEffects.h + # Because VectorImage.cpp includes nsSVGUtils.h and SVGObserverUtils.h '/layout/svg', # For URI-related functionality '/netwerk/base', diff --git a/layout/base/GeckoRestyleManager.cpp b/layout/base/GeckoRestyleManager.cpp index 576d67c3d83e..52060f2e22e9 100644 --- a/layout/base/GeckoRestyleManager.cpp +++ b/layout/base/GeckoRestyleManager.cpp @@ -28,7 +28,7 @@ #include "nsStyleSet.h" #include "nsStyleUtil.h" #include "nsCSSFrameConstructor.h" -#include "nsSVGEffects.h" +#include "SVGObserverUtils.h" #include "nsCSSPseudoElements.h" #include "nsCSSRendering.h" #include "nsAnimationManager.h" diff --git a/layout/base/PresShell.cpp b/layout/base/PresShell.cpp index 8017d6668875..2d6d42b54655 100644 --- a/layout/base/PresShell.cpp +++ b/layout/base/PresShell.cpp @@ -110,7 +110,7 @@ #include "gfxUtils.h" #include "nsSMILAnimationController.h" #include "SVGContentUtils.h" -#include "nsSVGEffects.h" +#include "SVGObserverUtils.h" #include "SVGFragmentIdentifier.h" #include "nsFrameSelection.h" diff --git a/layout/generic/nsFrame.cpp b/layout/generic/nsFrame.cpp index b8761d525f9b..e92faa03cfca 100644 --- a/layout/generic/nsFrame.cpp +++ b/layout/generic/nsFrame.cpp @@ -76,7 +76,7 @@ #include "nsBlockFrame.h" #include "nsDisplayList.h" #include "nsSVGIntegrationUtils.h" -#include "nsSVGEffects.h" +#include "SVGObserverUtils.h" #include "nsChangeHint.h" #include "nsDeckFrame.h" #include "nsSubDocumentFrame.h" diff --git a/layout/painting/nsCSSRendering.cpp b/layout/painting/nsCSSRendering.cpp index 571be4971865..7f67bab1ef8c 100644 --- a/layout/painting/nsCSSRendering.cpp +++ b/layout/painting/nsCSSRendering.cpp @@ -46,7 +46,7 @@ #include "nsCSSFrameConstructor.h" #include "nsCSSProps.h" #include "nsContentUtils.h" -#include "nsSVGEffects.h" +#include "SVGObserverUtils.h" #include "nsSVGIntegrationUtils.h" #include "gfxDrawable.h" #include "GeckoProfiler.h" diff --git a/layout/painting/nsDisplayList.cpp b/layout/painting/nsDisplayList.cpp index 55572130b82a..06f12398f0b7 100644 --- a/layout/painting/nsDisplayList.cpp +++ b/layout/painting/nsDisplayList.cpp @@ -43,7 +43,7 @@ #include "BasicLayers.h" #include "nsBoxFrame.h" #include "nsSubDocumentFrame.h" -#include "nsSVGEffects.h" +#include "SVGObserverUtils.h" #include "nsSVGElement.h" #include "nsSVGClipPathFrame.h" #include "GeckoProfiler.h" diff --git a/layout/painting/nsImageRenderer.cpp b/layout/painting/nsImageRenderer.cpp index 2eb8b84bfdb7..b49071c2f41b 100644 --- a/layout/painting/nsImageRenderer.cpp +++ b/layout/painting/nsImageRenderer.cpp @@ -20,7 +20,7 @@ #include "nsIFrame.h" #include "nsStyleStructInlines.h" #include "nsSVGDisplayableFrame.h" -#include "nsSVGEffects.h" +#include "SVGObserverUtils.h" #include "nsSVGIntegrationUtils.h" using namespace mozilla; diff --git a/layout/style/ImageLoader.cpp b/layout/style/ImageLoader.cpp index 1e742a925b36..13b93bb9ec6c 100644 --- a/layout/style/ImageLoader.cpp +++ b/layout/style/ImageLoader.cpp @@ -13,7 +13,7 @@ #include "nsError.h" #include "nsDisplayList.h" #include "FrameLayerBuilder.h" -#include "nsSVGEffects.h" +#include "SVGObserverUtils.h" #include "imgIContainer.h" #include "Image.h" diff --git a/layout/svg/SVGContextPaint.cpp b/layout/svg/SVGContextPaint.cpp index 5d6e3b324982..8be2d754f9e5 100644 --- a/layout/svg/SVGContextPaint.cpp +++ b/layout/svg/SVGContextPaint.cpp @@ -10,7 +10,7 @@ #include "mozilla/Preferences.h" #include "nsIDocument.h" #include "nsSVGPaintServerFrame.h" -#include "nsSVGEffects.h" +#include "SVGObserverUtils.h" #include "nsSVGPaintServerFrame.h" using namespace mozilla::gfx; diff --git a/layout/svg/SVGFEContainerFrame.cpp b/layout/svg/SVGFEContainerFrame.cpp index ae4a94edbfbc..f79269590182 100644 --- a/layout/svg/SVGFEContainerFrame.cpp +++ b/layout/svg/SVGFEContainerFrame.cpp @@ -8,7 +8,7 @@ #include "nsGkAtoms.h" #include "nsIFrame.h" #include "nsLiteralString.h" -#include "nsSVGEffects.h" +#include "SVGObserverUtils.h" #include "nsSVGFilters.h" /* diff --git a/layout/svg/SVGFEImageFrame.cpp b/layout/svg/SVGFEImageFrame.cpp index d5dd7b623e4d..1a852f34c083 100644 --- a/layout/svg/SVGFEImageFrame.cpp +++ b/layout/svg/SVGFEImageFrame.cpp @@ -10,7 +10,7 @@ #include "nsGkAtoms.h" #include "nsIDOMMutationEvent.h" #include "nsLiteralString.h" -#include "nsSVGEffects.h" +#include "SVGObserverUtils.h" #include "nsSVGFilters.h" #include "mozilla/dom/SVGFEImageElement.h" diff --git a/layout/svg/SVGFELeafFrame.cpp b/layout/svg/SVGFELeafFrame.cpp index b72c0cc00981..c98ca2b56ec7 100644 --- a/layout/svg/SVGFELeafFrame.cpp +++ b/layout/svg/SVGFELeafFrame.cpp @@ -7,7 +7,7 @@ #include "nsContainerFrame.h" #include "nsFrame.h" #include "nsGkAtoms.h" -#include "nsSVGEffects.h" +#include "SVGObserverUtils.h" #include "nsSVGFilters.h" /* diff --git a/layout/svg/SVGFEUnstyledLeafFrame.cpp b/layout/svg/SVGFEUnstyledLeafFrame.cpp index 8b6548765019..1d030d09b222 100644 --- a/layout/svg/SVGFEUnstyledLeafFrame.cpp +++ b/layout/svg/SVGFEUnstyledLeafFrame.cpp @@ -7,7 +7,7 @@ #include "nsContainerFrame.h" #include "nsFrame.h" #include "nsGkAtoms.h" -#include "nsSVGEffects.h" +#include "SVGObserverUtils.h" #include "nsSVGFilters.h" class SVGFEUnstyledLeafFrame : public nsFrame diff --git a/layout/svg/SVGGeometryFrame.cpp b/layout/svg/SVGGeometryFrame.cpp index f624cecbb9cb..c7ee40fc3292 100644 --- a/layout/svg/SVGGeometryFrame.cpp +++ b/layout/svg/SVGGeometryFrame.cpp @@ -18,7 +18,7 @@ #include "nsDisplayList.h" #include "nsGkAtoms.h" #include "nsLayoutUtils.h" -#include "nsSVGEffects.h" +#include "SVGObserverUtils.h" #include "nsSVGIntegrationUtils.h" #include "nsSVGMarkerFrame.h" #include "SVGGeometryElement.h" diff --git a/layout/svg/nsSVGEffects.cpp b/layout/svg/SVGObserverUtils.cpp similarity index 99% rename from layout/svg/nsSVGEffects.cpp rename to layout/svg/SVGObserverUtils.cpp index 1e8df63beaa6..9dd0fd7db65a 100644 --- a/layout/svg/nsSVGEffects.cpp +++ b/layout/svg/SVGObserverUtils.cpp @@ -4,7 +4,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ // Main header first: -#include "nsSVGEffects.h" +#include "SVGObserverUtils.h" // Keep others in (case-insensitive) order: #include "mozilla/RestyleManager.h" diff --git a/layout/svg/nsSVGEffects.h b/layout/svg/SVGObserverUtils.h similarity index 100% rename from layout/svg/nsSVGEffects.h rename to layout/svg/SVGObserverUtils.h diff --git a/layout/svg/SVGTextFrame.cpp b/layout/svg/SVGTextFrame.cpp index 57685a1c8c6f..3869489eef09 100644 --- a/layout/svg/SVGTextFrame.cpp +++ b/layout/svg/SVGTextFrame.cpp @@ -27,7 +27,7 @@ #include "nsIDOMSVGLength.h" #include "nsISelection.h" #include "nsQuickSort.h" -#include "nsSVGEffects.h" +#include "SVGObserverUtils.h" #include "nsSVGOuterSVGFrame.h" #include "nsSVGPaintServerFrame.h" #include "mozilla/dom/SVGRect.h" diff --git a/layout/svg/moz.build b/layout/svg/moz.build index b96cde0bec25..8bc3511ab004 100644 --- a/layout/svg/moz.build +++ b/layout/svg/moz.build @@ -17,7 +17,6 @@ if CONFIG['ENABLE_TESTS']: EXPORTS += [ 'nsFilterInstance.h', - 'nsSVGEffects.h', 'nsSVGFilterInstance.h', 'nsSVGForeignObjectFrame.h', 'nsSVGImageFrame.h', @@ -25,6 +24,7 @@ EXPORTS += [ 'nsSVGUseFrame.h', 'nsSVGUtils.h', 'SVGImageContext.h', + 'SVGObserverUtils.h', ] EXPORTS.mozilla += [ @@ -38,7 +38,6 @@ UNIFIED_SOURCES += [ 'nsSVGAFrame.cpp', 'nsSVGClipPathFrame.cpp', 'nsSVGContainerFrame.cpp', - 'nsSVGEffects.cpp', 'nsSVGFilterFrame.cpp', 'nsSVGFilterInstance.cpp', 'nsSVGForeignObjectFrame.cpp', @@ -65,6 +64,7 @@ UNIFIED_SOURCES += [ 'SVGFEUnstyledLeafFrame.cpp', 'SVGGeometryFrame.cpp', 'SVGImageContext.cpp', + 'SVGObserverUtils.cpp', 'SVGTextFrame.cpp', 'SVGViewFrame.cpp', ] diff --git a/layout/svg/nsSVGClipPathFrame.cpp b/layout/svg/nsSVGClipPathFrame.cpp index 489050af3ac7..513e1fb483a5 100644 --- a/layout/svg/nsSVGClipPathFrame.cpp +++ b/layout/svg/nsSVGClipPathFrame.cpp @@ -12,7 +12,7 @@ #include "gfxContext.h" #include "mozilla/dom/SVGClipPathElement.h" #include "nsGkAtoms.h" -#include "nsSVGEffects.h" +#include "SVGObserverUtils.h" #include "SVGGeometryElement.h" #include "SVGGeometryFrame.h" #include "nsSVGUtils.h" diff --git a/layout/svg/nsSVGContainerFrame.cpp b/layout/svg/nsSVGContainerFrame.cpp index dcd057869455..52a692bb6fae 100644 --- a/layout/svg/nsSVGContainerFrame.cpp +++ b/layout/svg/nsSVGContainerFrame.cpp @@ -11,7 +11,7 @@ #include "mozilla/RestyleManager.h" #include "mozilla/RestyleManagerInlines.h" #include "nsCSSFrameConstructor.h" -#include "nsSVGEffects.h" +#include "SVGObserverUtils.h" #include "nsSVGElement.h" #include "nsSVGUtils.h" #include "nsSVGAnimatedTransformList.h" diff --git a/layout/svg/nsSVGFilterFrame.cpp b/layout/svg/nsSVGFilterFrame.cpp index 292efde71c93..afdb91925751 100644 --- a/layout/svg/nsSVGFilterFrame.cpp +++ b/layout/svg/nsSVGFilterFrame.cpp @@ -10,7 +10,7 @@ #include "AutoReferenceChainGuard.h" #include "gfxUtils.h" #include "nsGkAtoms.h" -#include "nsSVGEffects.h" +#include "SVGObserverUtils.h" #include "nsSVGElement.h" #include "mozilla/dom/SVGFilterElement.h" #include "nsSVGFilterInstance.h" diff --git a/layout/svg/nsSVGFilterInstance.cpp b/layout/svg/nsSVGFilterInstance.cpp index 468eaced5d5d..406998ca4e7f 100644 --- a/layout/svg/nsSVGFilterInstance.cpp +++ b/layout/svg/nsSVGFilterInstance.cpp @@ -13,7 +13,7 @@ #include "mozilla/dom/HTMLCanvasElement.h" #include "mozilla/dom/SVGFilterElement.h" #include "nsReferencedElement.h" -#include "nsSVGEffects.h" +#include "SVGObserverUtils.h" #include "nsSVGFilterFrame.h" #include "nsSVGUtils.h" #include "SVGContentUtils.h" diff --git a/layout/svg/nsSVGForeignObjectFrame.cpp b/layout/svg/nsSVGForeignObjectFrame.cpp index b98d50844dd0..e5b81f806604 100644 --- a/layout/svg/nsSVGForeignObjectFrame.cpp +++ b/layout/svg/nsSVGForeignObjectFrame.cpp @@ -15,7 +15,7 @@ #include "nsLayoutUtils.h" #include "nsRegion.h" #include "nsSVGContainerFrame.h" -#include "nsSVGEffects.h" +#include "SVGObserverUtils.h" #include "mozilla/dom/SVGForeignObjectElement.h" #include "nsSVGIntegrationUtils.h" #include "nsSVGOuterSVGFrame.h" diff --git a/layout/svg/nsSVGGradientFrame.cpp b/layout/svg/nsSVGGradientFrame.cpp index a0d88f4d3fe6..e7c6e9ae433d 100644 --- a/layout/svg/nsSVGGradientFrame.cpp +++ b/layout/svg/nsSVGGradientFrame.cpp @@ -13,7 +13,7 @@ #include "mozilla/dom/SVGGradientElement.h" #include "mozilla/dom/SVGStopElement.h" #include "nsContentUtils.h" -#include "nsSVGEffects.h" +#include "SVGObserverUtils.h" #include "nsSVGAnimatedTransformList.h" // XXX Tight coupling with content classes ahead! diff --git a/layout/svg/nsSVGImageFrame.cpp b/layout/svg/nsSVGImageFrame.cpp index 1e549c52cf02..ca0576fd5866 100644 --- a/layout/svg/nsSVGImageFrame.cpp +++ b/layout/svg/nsSVGImageFrame.cpp @@ -15,7 +15,7 @@ #include "nsIImageLoadingContent.h" #include "nsLayoutUtils.h" #include "imgINotificationObserver.h" -#include "nsSVGEffects.h" +#include "SVGObserverUtils.h" #include "mozilla/dom/SVGSVGElement.h" #include "nsSVGUtils.h" #include "SVGContentUtils.h" diff --git a/layout/svg/nsSVGImageFrame.h b/layout/svg/nsSVGImageFrame.h index b2c90fd6402d..b3b5b51bb18d 100644 --- a/layout/svg/nsSVGImageFrame.h +++ b/layout/svg/nsSVGImageFrame.h @@ -16,7 +16,7 @@ #include "nsIImageLoadingContent.h" #include "nsLayoutUtils.h" #include "imgINotificationObserver.h" -#include "nsSVGEffects.h" +#include "SVGObserverUtils.h" #include "mozilla/dom/SVGSVGElement.h" #include "nsSVGUtils.h" #include "SVGContentUtils.h" diff --git a/layout/svg/nsSVGIntegrationUtils.cpp b/layout/svg/nsSVGIntegrationUtils.cpp index 7c7bf76c721b..24a50d912511 100644 --- a/layout/svg/nsSVGIntegrationUtils.cpp +++ b/layout/svg/nsSVGIntegrationUtils.cpp @@ -16,7 +16,7 @@ #include "nsLayoutUtils.h" #include "gfxContext.h" #include "nsSVGClipPathFrame.h" -#include "nsSVGEffects.h" +#include "SVGObserverUtils.h" #include "nsSVGElement.h" #include "nsSVGFilterPaintCallback.h" #include "nsSVGMaskFrame.h" diff --git a/layout/svg/nsSVGMarkerFrame.cpp b/layout/svg/nsSVGMarkerFrame.cpp index 9fdefbea7976..55bf5c922594 100644 --- a/layout/svg/nsSVGMarkerFrame.cpp +++ b/layout/svg/nsSVGMarkerFrame.cpp @@ -8,7 +8,7 @@ // Keep others in (case-insensitive) order: #include "gfxContext.h" -#include "nsSVGEffects.h" +#include "SVGObserverUtils.h" #include "mozilla/dom/SVGMarkerElement.h" #include "SVGGeometryElement.h" #include "SVGGeometryFrame.h" diff --git a/layout/svg/nsSVGMaskFrame.cpp b/layout/svg/nsSVGMaskFrame.cpp index fa0ee4e84cff..4275ab38963e 100644 --- a/layout/svg/nsSVGMaskFrame.cpp +++ b/layout/svg/nsSVGMaskFrame.cpp @@ -12,7 +12,7 @@ #include "gfxContext.h" #include "mozilla/gfx/2D.h" #include "mozilla/RefPtr.h" -#include "nsSVGEffects.h" +#include "SVGObserverUtils.h" #include "mozilla/dom/SVGMaskElement.h" using namespace mozilla; diff --git a/layout/svg/nsSVGPatternFrame.cpp b/layout/svg/nsSVGPatternFrame.cpp index 805f21d9a38c..1796e17167f0 100644 --- a/layout/svg/nsSVGPatternFrame.cpp +++ b/layout/svg/nsSVGPatternFrame.cpp @@ -18,7 +18,7 @@ #include "nsGkAtoms.h" #include "nsSVGDisplayableFrame.h" #include "nsStyleContext.h" -#include "nsSVGEffects.h" +#include "SVGObserverUtils.h" #include "SVGGeometryFrame.h" #include "mozilla/dom/SVGPatternElement.h" #include "nsSVGUtils.h" diff --git a/layout/svg/nsSVGStopFrame.cpp b/layout/svg/nsSVGStopFrame.cpp index 8e628884c7e6..f8279da5b157 100644 --- a/layout/svg/nsSVGStopFrame.cpp +++ b/layout/svg/nsSVGStopFrame.cpp @@ -8,7 +8,7 @@ #include "nsFrame.h" #include "nsGkAtoms.h" #include "nsStyleContext.h" -#include "nsSVGEffects.h" +#include "SVGObserverUtils.h" // This is a very simple frame whose only purpose is to capture style change // events and propagate them to the parent. Most of the heavy lifting is done diff --git a/layout/svg/nsSVGSwitchFrame.cpp b/layout/svg/nsSVGSwitchFrame.cpp index bc0005b0fef8..92b08ec660e7 100644 --- a/layout/svg/nsSVGSwitchFrame.cpp +++ b/layout/svg/nsSVGSwitchFrame.cpp @@ -5,7 +5,7 @@ // Keep in (case-insensitive) order: #include "gfxRect.h" -#include "nsSVGEffects.h" +#include "SVGObserverUtils.h" #include "nsSVGGFrame.h" #include "mozilla/dom/SVGSwitchElement.h" #include "nsSVGUtils.h" diff --git a/layout/svg/nsSVGUseFrame.cpp b/layout/svg/nsSVGUseFrame.cpp index f6738156976b..ecd64805152c 100644 --- a/layout/svg/nsSVGUseFrame.cpp +++ b/layout/svg/nsSVGUseFrame.cpp @@ -7,7 +7,7 @@ #include "nsContentUtils.h" #include "mozilla/dom/SVGUseElement.h" -#include "nsSVGEffects.h" +#include "SVGObserverUtils.h" using namespace mozilla::dom; diff --git a/layout/svg/nsSVGUtils.cpp b/layout/svg/nsSVGUtils.cpp index 8d55eea66d69..ea91fd7a8974 100644 --- a/layout/svg/nsSVGUtils.cpp +++ b/layout/svg/nsSVGUtils.cpp @@ -36,7 +36,7 @@ #include "nsStyleStruct.h" #include "nsSVGClipPathFrame.h" #include "nsSVGContainerFrame.h" -#include "nsSVGEffects.h" +#include "SVGObserverUtils.h" #include "nsSVGFilterPaintCallback.h" #include "nsSVGForeignObjectFrame.h" #include "nsSVGInnerSVGFrame.h"