From f6d17b63b539b790ec3165e41193045255ac7a66 Mon Sep 17 00:00:00 2001 From: Kagami Sascha Rosylight Date: Mon, 6 Jul 2020 22:38:11 +0000 Subject: [PATCH] Bug 1630704 - Part 28: Remove nsFrame r=emilio Differential Revision: https://phabricator.services.mozilla.com/D81865 --- dom/base/Document.cpp | 4 +- dom/base/nsDOMWindowUtils.cpp | 7 +- gfx/layers/wr/WebRenderCommandBuilder.cpp | 4 +- layout/base/AccessibleCaretManager.cpp | 2 +- layout/base/PresShell.cpp | 2 +- layout/base/nsLayoutDebugger.cpp | 2 +- layout/build/nsLayoutStatics.cpp | 2 +- layout/forms/nsButtonFrameRenderer.cpp | 2 +- layout/forms/nsButtonFrameRenderer.h | 1 - layout/generic/BRFrame.cpp | 2 +- layout/generic/FrameClasses.py | 1 - layout/generic/ReflowInput.cpp | 2 +- layout/generic/WBRFrame.cpp | 2 +- layout/generic/moz.build | 3 +- layout/generic/nsBackdropFrame.h | 2 +- layout/generic/nsBulletFrame.h | 2 +- layout/generic/nsFrame.h | 78 ------------------- layout/generic/{nsFrame.cpp => nsIFrame.cpp} | 13 +--- layout/generic/nsIFrame.h | 17 +++- layout/generic/nsLeafFrame.h | 2 +- layout/generic/nsLineBox.cpp | 2 +- layout/generic/nsPlaceholderFrame.h | 2 +- layout/generic/nsPluginFrame.h | 2 +- layout/generic/nsSplittableFrame.h | 2 +- layout/generic/nsTextFrame.cpp | 2 +- layout/generic/nsTextFrame.h | 2 +- layout/svg/SVGFEImageFrame.cpp | 2 +- layout/svg/SVGFELeafFrame.cpp | 2 +- layout/svg/SVGFEUnstyledLeafFrame.cpp | 2 +- layout/svg/SVGFilterFrame.h | 2 +- layout/svg/SVGGenericContainerFrame.h | 2 +- layout/svg/SVGGeometryFrame.h | 2 +- layout/svg/SVGMarkerFrame.h | 2 +- layout/svg/SVGViewFrame.cpp | 2 +- layout/svg/nsSVGContainerFrame.h | 2 +- layout/svg/nsSVGGradientFrame.h | 2 +- layout/svg/nsSVGPaintServerFrame.h | 2 +- layout/svg/nsSVGStopFrame.cpp | 2 +- .../src/nsLayoutDebuggingTools.cpp | 2 +- layout/xul/grid/nsGridCell.cpp | 2 +- 40 files changed, 57 insertions(+), 133 deletions(-) delete mode 100644 layout/generic/nsFrame.h rename layout/generic/{nsFrame.cpp => nsIFrame.cpp} (99%) diff --git a/dom/base/Document.cpp b/dom/base/Document.cpp index 3e3574535d48..96e84f92dc2d 100644 --- a/dom/base/Document.cpp +++ b/dom/base/Document.cpp @@ -293,7 +293,7 @@ #include "mozilla/dom/TimeoutManager.h" #include "mozilla/dom/DocumentL10n.h" #include "mozilla/ExtensionPolicyService.h" -#include "nsFrame.h" +#include "nsIFrame.h" #include "nsDOMCaretPosition.h" #include "nsViewportInfo.h" #include "mozilla/StaticPtr.h" @@ -12412,7 +12412,7 @@ already_AddRefed Document::CaretPositionFromPoint( nsPoint adjustedPoint = nsLayoutUtils::GetEventCoordinatesRelativeTo( widget, refPoint, RelativeTo{ptFrame}); - nsFrame::ContentOffsets offsets = + nsIFrame::ContentOffsets offsets = ptFrame->GetContentOffsetsFromPoint(adjustedPoint); nsCOMPtr node = offsets.content; diff --git a/dom/base/nsDOMWindowUtils.cpp b/dom/base/nsDOMWindowUtils.cpp index 676e25b1e832..2f21ad238197 100644 --- a/dom/base/nsDOMWindowUtils.cpp +++ b/dom/base/nsDOMWindowUtils.cpp @@ -27,7 +27,7 @@ #include "mozilla/PendingAnimationTracker.h" #include "mozilla/SharedStyleSheetCache.h" #include "nsIObjectLoadingContent.h" -#include "nsFrame.h" +#include "nsIFrame.h" #include "mozilla/layers/APZCCallbackHelper.h" #include "mozilla/layers/PCompositorBridgeTypes.h" #include "mozilla/layers/ShadowLayers.h" @@ -3318,9 +3318,8 @@ nsDOMWindowUtils::SelectAtPoint(float aX, float aY, uint32_t aSelectBehavior, nsPoint relPoint = nsLayoutUtils::GetEventCoordinatesRelativeTo( widget, pt, RelativeTo{targetFrame}); - nsresult rv = static_cast(targetFrame) - ->SelectByTypeAtPoint(GetPresContext(), relPoint, amount, - amount, nsFrame::SELECT_ACCUMULATE); + nsresult rv = targetFrame->SelectByTypeAtPoint( + GetPresContext(), relPoint, amount, amount, nsIFrame::SELECT_ACCUMULATE); *_retval = !NS_FAILED(rv); return NS_OK; } diff --git a/gfx/layers/wr/WebRenderCommandBuilder.cpp b/gfx/layers/wr/WebRenderCommandBuilder.cpp index d1b69153ba99..501563668adb 100644 --- a/gfx/layers/wr/WebRenderCommandBuilder.cpp +++ b/gfx/layers/wr/WebRenderCommandBuilder.cpp @@ -1749,8 +1749,8 @@ void WebRenderCommandBuilder::CreateWebRenderCommandsFromDisplayList( if (dumpEnabled) { std::stringstream ss; - nsFrame::PrintDisplayItem(aDisplayListBuilder, item, ss, - static_cast(mDumpIndent)); + nsIFrame::PrintDisplayItem(aDisplayListBuilder, item, ss, + static_cast(mDumpIndent)); printf_stderr("%s", ss.str().c_str()); } diff --git a/layout/base/AccessibleCaretManager.cpp b/layout/base/AccessibleCaretManager.cpp index 39a64ec3fc03..c6c4127e9594 100644 --- a/layout/base/AccessibleCaretManager.cpp +++ b/layout/base/AccessibleCaretManager.cpp @@ -25,7 +25,7 @@ #include "nsContentUtils.h" #include "nsDebug.h" #include "nsFocusManager.h" -#include "nsFrame.h" +#include "nsIFrame.h" #include "nsFrameSelection.h" #include "nsGenericHTMLElement.h" #include "nsIHapticFeedback.h" diff --git a/layout/base/PresShell.cpp b/layout/base/PresShell.cpp index 2a1f0f5d446e..24527144cf02 100644 --- a/layout/base/PresShell.cpp +++ b/layout/base/PresShell.cpp @@ -60,7 +60,7 @@ #include "nsAnimationManager.h" #include "nsNameSpaceManager.h" // for Pref-related rule management (bugs 22963,20760,31816) #include "nsFlexContainerFrame.h" -#include "nsFrame.h" +#include "nsIFrame.h" #include "FrameLayerBuilder.h" #include "nsViewManager.h" #include "nsView.h" diff --git a/layout/base/nsLayoutDebugger.cpp b/layout/base/nsLayoutDebugger.cpp index a0f9d58eef7c..b7ea09a5c1ce 100644 --- a/layout/base/nsLayoutDebugger.cpp +++ b/layout/base/nsLayoutDebugger.cpp @@ -7,7 +7,7 @@ /* some layout debugging functions that ought to live in nsFrame.cpp */ #include "nsAttrValue.h" -#include "nsFrame.h" +#include "nsIFrame.h" #include "nsDisplayList.h" #include "FrameLayerBuilder.h" #include "nsPrintfCString.h" diff --git a/layout/build/nsLayoutStatics.cpp b/layout/build/nsLayoutStatics.cpp index 32d774095a45..e2530fd9a903 100644 --- a/layout/build/nsLayoutStatics.cpp +++ b/layout/build/nsLayoutStatics.cpp @@ -25,7 +25,7 @@ #include "nsGenericHTMLFrameElement.h" #include "mozilla/dom/Attr.h" #include "mozilla/dom/PopupBlocker.h" -#include "nsFrame.h" +#include "nsIFrame.h" #include "nsFrameState.h" #include "nsGlobalWindow.h" #include "nsGkAtoms.h" diff --git a/layout/forms/nsButtonFrameRenderer.cpp b/layout/forms/nsButtonFrameRenderer.cpp index 948f87c41711..5cbebf94708d 100644 --- a/layout/forms/nsButtonFrameRenderer.cpp +++ b/layout/forms/nsButtonFrameRenderer.cpp @@ -14,7 +14,7 @@ #include "mozilla/Unused.h" #include "nsDisplayList.h" #include "nsITheme.h" -#include "nsFrame.h" +#include "nsIFrame.h" #include "mozilla/EventStates.h" #include "mozilla/dom/Element.h" #include "Layers.h" diff --git a/layout/forms/nsButtonFrameRenderer.h b/layout/forms/nsButtonFrameRenderer.h index a1eb0313bf4e..300f9dd1bc30 100644 --- a/layout/forms/nsButtonFrameRenderer.h +++ b/layout/forms/nsButtonFrameRenderer.h @@ -12,7 +12,6 @@ class gfxContext; class nsIFrame; -class nsFrame; class nsDisplayList; class nsDisplayListBuilder; class nsPresContext; diff --git a/layout/generic/BRFrame.cpp b/layout/generic/BRFrame.cpp index fd6cdc303269..52af64e708c0 100644 --- a/layout/generic/BRFrame.cpp +++ b/layout/generic/BRFrame.cpp @@ -12,7 +12,7 @@ #include "nsCOMPtr.h" #include "nsContainerFrame.h" #include "nsFontMetrics.h" -#include "nsFrame.h" +#include "nsIFrame.h" #include "nsPresContext.h" #include "nsLineLayout.h" #include "nsStyleConsts.h" diff --git a/layout/generic/FrameClasses.py b/layout/generic/FrameClasses.py index 2ed7ff7d81b5..f22236568d96 100644 --- a/layout/generic/FrameClasses.py +++ b/layout/generic/FrameClasses.py @@ -31,7 +31,6 @@ FRAME_CLASSES = [ Frame("nsFirstLetterFrame", "Letter", NOT_LEAF), Frame("nsFirstLineFrame", "Line", NOT_LEAF), Frame("nsFlexContainerFrame", "FlexContainer", NOT_LEAF), - Frame("nsFrame", "None", NOT_LEAF), Frame("nsIFrame", "None", NOT_LEAF), Frame("nsGfxButtonControlFrame", "GfxButtonControl", LEAF), Frame("nsGridContainerFrame", "GridContainer", NOT_LEAF), diff --git a/layout/generic/ReflowInput.cpp b/layout/generic/ReflowInput.cpp index c398579ececf..f6a201315040 100644 --- a/layout/generic/ReflowInput.cpp +++ b/layout/generic/ReflowInput.cpp @@ -11,7 +11,7 @@ #include "LayoutLogging.h" #include "nsStyleConsts.h" #include "nsCSSAnonBoxes.h" -#include "nsFrame.h" +#include "nsIFrame.h" #include "nsIContent.h" #include "nsGkAtoms.h" #include "nsPresContext.h" diff --git a/layout/generic/WBRFrame.cpp b/layout/generic/WBRFrame.cpp index ccd67844ab35..8ff59820b0fb 100644 --- a/layout/generic/WBRFrame.cpp +++ b/layout/generic/WBRFrame.cpp @@ -6,7 +6,7 @@ /* rendering object for HTML elements */ -#include "nsFrame.h" +#include "nsIFrame.h" using namespace mozilla; diff --git a/layout/generic/moz.build b/layout/generic/moz.build index 2d8c2cb18d88..1eb310a1d576 100644 --- a/layout/generic/moz.build +++ b/layout/generic/moz.build @@ -100,7 +100,6 @@ EXPORTS += [ 'nsCanvasFrame.h', 'nsContainerFrame.h', 'nsDirection.h', - 'nsFrame.h', 'nsFrameList.h', 'nsFrameSelection.h', 'nsFrameState.h', @@ -183,7 +182,6 @@ UNIFIED_SOURCES += [ 'nsFlexContainerFrame.cpp', 'nsFloatManager.cpp', 'nsFontInflationData.cpp', - 'nsFrame.cpp', 'nsFrameList.cpp', 'nsFrameSelection.cpp', 'nsFrameSetFrame.cpp', @@ -191,6 +189,7 @@ UNIFIED_SOURCES += [ 'nsGfxScrollFrame.cpp', 'nsGridContainerFrame.cpp', 'nsHTMLCanvasFrame.cpp', + 'nsIFrame.cpp', 'nsImageFrame.cpp', 'nsImageMap.cpp', 'nsInlineFrame.cpp', diff --git a/layout/generic/nsBackdropFrame.h b/layout/generic/nsBackdropFrame.h index 6ceca6aa98ea..c6d496e1dc1a 100644 --- a/layout/generic/nsBackdropFrame.h +++ b/layout/generic/nsBackdropFrame.h @@ -9,7 +9,7 @@ #ifndef nsBackdropFrame_h___ #define nsBackdropFrame_h___ -#include "nsFrame.h" +#include "nsIFrame.h" class nsBackdropFrame final : public nsIFrame { public: diff --git a/layout/generic/nsBulletFrame.h b/layout/generic/nsBulletFrame.h index 2e7a7cadfc1d..30cded238716 100644 --- a/layout/generic/nsBulletFrame.h +++ b/layout/generic/nsBulletFrame.h @@ -10,7 +10,7 @@ #define nsBulletFrame_h___ #include "mozilla/Attributes.h" -#include "nsFrame.h" +#include "nsIFrame.h" #include "imgIContainer.h" #include "imgINotificationObserver.h" diff --git a/layout/generic/nsFrame.h b/layout/generic/nsFrame.h deleted file mode 100644 index 5f4b8ef745cb..000000000000 --- a/layout/generic/nsFrame.h +++ /dev/null @@ -1,78 +0,0 @@ -/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* vim: set ts=8 sts=2 et sw=2 tw=80: */ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -/* base class of all rendering objects */ - -#ifndef nsFrame_h___ -#define nsFrame_h___ - -#include "mozilla/Attributes.h" -#include "mozilla/EventForwards.h" -#include "mozilla/Likely.h" -#include "mozilla/Logging.h" - -#include "mozilla/ReflowInput.h" -#include "nsHTMLParts.h" -#include "nsISelectionDisplay.h" - -namespace mozilla { -enum class TableSelectionMode : uint32_t; -class PresShell; -} // namespace mozilla - -struct nsBoxLayoutMetrics; -struct nsRect; - -/** - * Implementation of a simple frame that's not splittable and has no - * child frames. - * - * Sets the NS_FRAME_SYNCHRONIZE_FRAME_AND_VIEW bit, so the default - * behavior is to keep the frame and view position and size in sync. - */ -class nsFrame : public nsIFrame { - public: - /** - * Create a new "empty" frame that maps a given piece of content into a - * 0,0 area. - */ - friend nsIFrame* NS_NewEmptyFrame(mozilla::PresShell* aShell, - ComputedStyle* aStyle); - - private: - // Left undefined; nsFrame objects are never allocated from the heap. - void* operator new(size_t sz) noexcept(true); - - protected: - // Overridden to prevent the global delete from being called, since - // the memory came out of an arena instead of the heap. - // - // Ideally this would be private and undefined, like the normal - // operator new. Unfortunately, the C++ standard requires an - // overridden operator delete to be accessible to any subclass that - // defines a virtual destructor, so we can only make it protected; - // worse, some C++ compilers will synthesize calls to this function - // from the "deleting destructors" that they emit in case of - // delete-expressions, so it can't even be undefined. - void operator delete(void* aPtr, size_t sz); - - public: - // nsQueryFrame - NS_DECL_QUERYFRAME - NS_DECL_QUERYFRAME_TARGET(nsFrame) - nsQueryFrame::FrameIID GetFrameId() const override MOZ_MUST_OVERRIDE { - return kFrameIID; - } - void* operator new(size_t, mozilla::PresShell*) MOZ_MUST_OVERRIDE; - - protected: - // Protected constructor and destructor - nsFrame(ComputedStyle* aStyle, nsPresContext* aPresContext, ClassID aID); - explicit nsFrame(ComputedStyle* aStyle, nsPresContext* aPresContext) - : nsFrame(aStyle, aPresContext, ClassID::nsFrame_id) {} -}; - -#endif /* nsFrame_h___ */ diff --git a/layout/generic/nsFrame.cpp b/layout/generic/nsIFrame.cpp similarity index 99% rename from layout/generic/nsFrame.cpp rename to layout/generic/nsIFrame.cpp index 6285b0c683bf..6e4e261c73e6 100644 --- a/layout/generic/nsFrame.cpp +++ b/layout/generic/nsIFrame.cpp @@ -6,7 +6,7 @@ /* base class of all rendering objects */ -#include "nsFrame.h" +#include "nsIFrame.h" #include #include @@ -469,10 +469,6 @@ nsIFrame* NS_NewEmptyFrame(PresShell* aPresShell, ComputedStyle* aStyle) { return new (aPresShell) nsIFrame(aStyle, aPresShell->GetPresContext()); } -nsFrame::nsFrame(ComputedStyle* aStyle, nsPresContext* aPresContext, - ClassID aID) - : nsIFrame(aStyle, aPresContext, aID) {} - nsIFrame::~nsIFrame() { MOZ_COUNT_DTOR(nsIFrame); @@ -480,19 +476,14 @@ nsIFrame::~nsIFrame() { "Visible nsFrame is being destroyed"); } -NS_IMPL_FRAMEARENA_HELPERS(nsFrame) NS_IMPL_FRAMEARENA_HELPERS(nsIFrame) // Dummy operator delete. Will never be called, but must be defined // to satisfy some C++ ABIs. -void nsFrame::operator delete(void*, size_t) { +void nsIFrame::operator delete(void*, size_t) { MOZ_CRASH("nsIFrame::operator delete should never be called"); } -NS_QUERYFRAME_HEAD(nsFrame) - NS_QUERYFRAME_ENTRY(nsIFrame) -NS_QUERYFRAME_TAIL_INHERITING(nsIFrame) - NS_QUERYFRAME_HEAD(nsIFrame) NS_QUERYFRAME_ENTRY(nsIFrame) NS_QUERYFRAME_TAIL_INHERITANCE_ROOT diff --git a/layout/generic/nsIFrame.h b/layout/generic/nsIFrame.h index f2f39f81e47f..32ec14c276aa 100644 --- a/layout/generic/nsIFrame.h +++ b/layout/generic/nsIFrame.h @@ -63,6 +63,7 @@ #include "nsFrameList.h" #include "nsFrameState.h" #include "mozilla/ReflowInput.h" +#include "nsHTMLParts.h" #include "nsITheme.h" #include "nsLayoutUtils.h" #include "nsQueryFrame.h" @@ -813,13 +814,27 @@ class nsIFrame : public nsQueryFrame { friend class nsLineBox; // needed to pass aDestructRoot through to children friend class nsContainerFrame; // needed to pass aDestructRoot through to // children - friend class nsFrame; // need to assign mParent template friend class do_QueryFrameHelper; // to read mClass virtual ~nsIFrame(); + // Overridden to prevent the global delete from being called, since + // the memory came out of an arena instead of the heap. + // + // Ideally this would be private and undefined, like the normal + // operator new. Unfortunately, the C++ standard requires an + // overridden operator delete to be accessible to any subclass that + // defines a virtual destructor, so we can only make it protected; + // worse, some C++ compilers will synthesize calls to this function + // from the "deleting destructors" that they emit in case of + // delete-expressions, so it can't even be undefined. + void operator delete(void* aPtr, size_t sz); + private: + // Left undefined; nsFrame objects are never allocated from the heap. + void* operator new(size_t sz) noexcept(true); + // Returns true if this frame has any kind of CSS animations. bool HasCSSAnimations(); diff --git a/layout/generic/nsLeafFrame.h b/layout/generic/nsLeafFrame.h index 7e0dfc4dd5f2..f9bb010425b8 100644 --- a/layout/generic/nsLeafFrame.h +++ b/layout/generic/nsLeafFrame.h @@ -10,7 +10,7 @@ #define nsLeafFrame_h___ #include "mozilla/Attributes.h" -#include "nsFrame.h" +#include "nsIFrame.h" #include "nsDisplayList.h" /** diff --git a/layout/generic/nsLineBox.cpp b/layout/generic/nsLineBox.cpp index 89aec8f02ce9..f109bb760a88 100644 --- a/layout/generic/nsLineBox.cpp +++ b/layout/generic/nsLineBox.cpp @@ -16,7 +16,7 @@ #include "mozilla/WritingModes.h" #include "mozilla/ToString.h" #include "nsBidiPresUtils.h" -#include "nsFrame.h" +#include "nsIFrame.h" #include "nsIFrameInlines.h" #include "nsPresArena.h" #include "nsPrintfCString.h" diff --git a/layout/generic/nsPlaceholderFrame.h b/layout/generic/nsPlaceholderFrame.h index ce9cb749308d..7a3d5e0ce0ae 100644 --- a/layout/generic/nsPlaceholderFrame.h +++ b/layout/generic/nsPlaceholderFrame.h @@ -36,7 +36,7 @@ #define nsPlaceholderFrame_h___ #include "mozilla/Attributes.h" -#include "nsFrame.h" +#include "nsIFrame.h" #include "nsGkAtoms.h" namespace mozilla { diff --git a/layout/generic/nsPluginFrame.h b/layout/generic/nsPluginFrame.h index 5d9b4371c7b6..41f9e72bdf2c 100644 --- a/layout/generic/nsPluginFrame.h +++ b/layout/generic/nsPluginFrame.h @@ -13,7 +13,7 @@ #include "mozilla/EventForwards.h" #include "mozilla/UniquePtr.h" #include "nsIObjectFrame.h" -#include "nsFrame.h" +#include "nsIFrame.h" #include "nsRegion.h" #include "nsDisplayList.h" #include "nsIReflowCallback.h" diff --git a/layout/generic/nsSplittableFrame.h b/layout/generic/nsSplittableFrame.h index 37e7f069bfa3..7c901623baf7 100644 --- a/layout/generic/nsSplittableFrame.h +++ b/layout/generic/nsSplittableFrame.h @@ -13,7 +13,7 @@ #define nsSplittableFrame_h___ #include "mozilla/Attributes.h" -#include "nsFrame.h" +#include "nsIFrame.h" // Derived class that allows splitting class nsSplittableFrame : public nsIFrame { diff --git a/layout/generic/nsTextFrame.cpp b/layout/generic/nsTextFrame.cpp index 5efb6bdf51ef..29c87be42a28 100644 --- a/layout/generic/nsTextFrame.cpp +++ b/layout/generic/nsTextFrame.cpp @@ -50,7 +50,7 @@ #include "nsCSSColorUtils.h" #include "nsLayoutUtils.h" #include "nsDisplayList.h" -#include "nsFrame.h" +#include "nsIFrame.h" #include "nsIMathMLFrame.h" #include "nsPlaceholderFrame.h" #include "nsTextFrameUtils.h" diff --git a/layout/generic/nsTextFrame.h b/layout/generic/nsTextFrame.h index cf4d2292e33f..89e1b0eb99d9 100644 --- a/layout/generic/nsTextFrame.h +++ b/layout/generic/nsTextFrame.h @@ -12,7 +12,7 @@ #include "mozilla/gfx/2D.h" #include "mozilla/UniquePtr.h" #include "mozilla/dom/Text.h" -#include "nsFrame.h" +#include "nsIFrame.h" #include "nsFrameSelection.h" #include "nsSplittableFrame.h" #include "nsLineBox.h" diff --git a/layout/svg/SVGFEImageFrame.cpp b/layout/svg/SVGFEImageFrame.cpp index ed4af026a17b..e53791e04329 100644 --- a/layout/svg/SVGFEImageFrame.cpp +++ b/layout/svg/SVGFEImageFrame.cpp @@ -9,7 +9,7 @@ #include "mozilla/dom/SVGFEImageElement.h" #include "mozilla/dom/MutationEventBinding.h" #include "nsContainerFrame.h" -#include "nsFrame.h" +#include "nsIFrame.h" #include "nsGkAtoms.h" #include "nsLiteralString.h" #include "SVGObserverUtils.h" diff --git a/layout/svg/SVGFELeafFrame.cpp b/layout/svg/SVGFELeafFrame.cpp index 3caa4577a3ac..501c13b1977b 100644 --- a/layout/svg/SVGFELeafFrame.cpp +++ b/layout/svg/SVGFELeafFrame.cpp @@ -8,7 +8,7 @@ #include "ComputedStyle.h" #include "mozilla/PresShell.h" #include "nsContainerFrame.h" -#include "nsFrame.h" +#include "nsIFrame.h" #include "nsGkAtoms.h" #include "SVGObserverUtils.h" #include "SVGFilters.h" diff --git a/layout/svg/SVGFEUnstyledLeafFrame.cpp b/layout/svg/SVGFEUnstyledLeafFrame.cpp index c95aba9a9d77..3caf2ea317ec 100644 --- a/layout/svg/SVGFEUnstyledLeafFrame.cpp +++ b/layout/svg/SVGFEUnstyledLeafFrame.cpp @@ -7,7 +7,7 @@ // Keep in (case-insensitive) order: #include "mozilla/PresShell.h" #include "nsContainerFrame.h" -#include "nsFrame.h" +#include "nsIFrame.h" #include "nsGkAtoms.h" #include "SVGObserverUtils.h" #include "SVGFilters.h" diff --git a/layout/svg/SVGFilterFrame.h b/layout/svg/SVGFilterFrame.h index 5bf73a897f3a..79540c4cbd62 100644 --- a/layout/svg/SVGFilterFrame.h +++ b/layout/svg/SVGFilterFrame.h @@ -8,7 +8,7 @@ #define __NS_SVGFILTERFRAME_H__ #include "mozilla/Attributes.h" -#include "nsFrame.h" +#include "nsIFrame.h" #include "nsQueryFrame.h" #include "nsSVGContainerFrame.h" #include "nsSVGUtils.h" diff --git a/layout/svg/SVGGenericContainerFrame.h b/layout/svg/SVGGenericContainerFrame.h index b7433da08628..f710c1d6defb 100644 --- a/layout/svg/SVGGenericContainerFrame.h +++ b/layout/svg/SVGGenericContainerFrame.h @@ -9,7 +9,7 @@ #include "mozilla/Attributes.h" #include "gfxMatrix.h" -#include "nsFrame.h" +#include "nsIFrame.h" #include "nsLiteralString.h" #include "nsQueryFrame.h" #include "nsSVGContainerFrame.h" diff --git a/layout/svg/SVGGeometryFrame.h b/layout/svg/SVGGeometryFrame.h index 895160b3790b..8cf48c8bca59 100644 --- a/layout/svg/SVGGeometryFrame.h +++ b/layout/svg/SVGGeometryFrame.h @@ -11,7 +11,7 @@ #include "gfxMatrix.h" #include "gfxRect.h" #include "nsDisplayList.h" -#include "nsFrame.h" +#include "nsIFrame.h" #include "nsSVGDisplayableFrame.h" #include "nsLiteralString.h" #include "nsQueryFrame.h" diff --git a/layout/svg/SVGMarkerFrame.h b/layout/svg/SVGMarkerFrame.h index d81a353a7e34..8726c91ff7b3 100644 --- a/layout/svg/SVGMarkerFrame.h +++ b/layout/svg/SVGMarkerFrame.h @@ -10,7 +10,7 @@ #include "mozilla/Attributes.h" #include "gfxMatrix.h" #include "gfxRect.h" -#include "nsFrame.h" +#include "nsIFrame.h" #include "nsLiteralString.h" #include "nsQueryFrame.h" #include "nsSVGContainerFrame.h" diff --git a/layout/svg/SVGViewFrame.cpp b/layout/svg/SVGViewFrame.cpp index 534cdf9b8279..8487b3129bca 100644 --- a/layout/svg/SVGViewFrame.cpp +++ b/layout/svg/SVGViewFrame.cpp @@ -8,7 +8,7 @@ #include "mozilla/PresShell.h" #include "mozilla/dom/SVGSVGElement.h" #include "mozilla/dom/SVGViewElement.h" -#include "nsFrame.h" +#include "nsIFrame.h" #include "nsGkAtoms.h" #include "nsSVGOuterSVGFrame.h" diff --git a/layout/svg/nsSVGContainerFrame.h b/layout/svg/nsSVGContainerFrame.h index 62efb7551e08..4a69b303848b 100644 --- a/layout/svg/nsSVGContainerFrame.h +++ b/layout/svg/nsSVGContainerFrame.h @@ -10,7 +10,7 @@ #include "mozilla/Attributes.h" #include "mozilla/UniquePtr.h" #include "nsContainerFrame.h" -#include "nsFrame.h" +#include "nsIFrame.h" #include "nsIFrame.h" #include "nsSVGDisplayableFrame.h" #include "nsQueryFrame.h" diff --git a/layout/svg/nsSVGGradientFrame.h b/layout/svg/nsSVGGradientFrame.h index 38e8a147e278..7cd414cede91 100644 --- a/layout/svg/nsSVGGradientFrame.h +++ b/layout/svg/nsSVGGradientFrame.h @@ -11,7 +11,7 @@ #include "gfxMatrix.h" #include "gfxRect.h" #include "nsCOMPtr.h" -#include "nsFrame.h" +#include "nsIFrame.h" #include "nsLiteralString.h" #include "nsSVGPaintServerFrame.h" diff --git a/layout/svg/nsSVGPaintServerFrame.h b/layout/svg/nsSVGPaintServerFrame.h index 8ddf8e60efeb..5ef56abb356a 100644 --- a/layout/svg/nsSVGPaintServerFrame.h +++ b/layout/svg/nsSVGPaintServerFrame.h @@ -10,7 +10,7 @@ #include "gfxRect.h" #include "mozilla/Attributes.h" #include "nsCOMPtr.h" -#include "nsFrame.h" +#include "nsIFrame.h" #include "nsIFrame.h" #include "nsQueryFrame.h" #include "nsSVGContainerFrame.h" diff --git a/layout/svg/nsSVGStopFrame.cpp b/layout/svg/nsSVGStopFrame.cpp index 18da19323217..fc497a86c468 100644 --- a/layout/svg/nsSVGStopFrame.cpp +++ b/layout/svg/nsSVGStopFrame.cpp @@ -6,7 +6,7 @@ // Keep in (case-insensitive) order: #include "nsContainerFrame.h" -#include "nsFrame.h" +#include "nsIFrame.h" #include "nsGkAtoms.h" #include "mozilla/ComputedStyle.h" #include "mozilla/PresShell.h" diff --git a/layout/tools/layout-debug/src/nsLayoutDebuggingTools.cpp b/layout/tools/layout-debug/src/nsLayoutDebuggingTools.cpp index f10207bff846..6385044da4db 100644 --- a/layout/tools/layout-debug/src/nsLayoutDebuggingTools.cpp +++ b/layout/tools/layout-debug/src/nsLayoutDebuggingTools.cpp @@ -18,7 +18,7 @@ #include "nsIContent.h" #include "nsViewManager.h" -#include "nsFrame.h" +#include "nsIFrame.h" #include "nsLayoutCID.h" diff --git a/layout/xul/grid/nsGridCell.cpp b/layout/xul/grid/nsGridCell.cpp index f128ae9f3ba1..83774d209b48 100644 --- a/layout/xul/grid/nsGridCell.cpp +++ b/layout/xul/grid/nsGridCell.cpp @@ -12,7 +12,7 @@ // #include "nsGridCell.h" -#include "nsFrame.h" +#include "nsIFrame.h" #include "nsGridLayout2.h" nsGridCell::nsGridCell() : mBoxInColumn(nullptr), mBoxInRow(nullptr) {