diff --git a/layout/svg/nsSVGOuterSVGFrame.cpp b/layout/svg/nsSVGOuterSVGFrame.cpp index 328ba083d146..45c9edb9e6ae 100644 --- a/layout/svg/nsSVGOuterSVGFrame.cpp +++ b/layout/svg/nsSVGOuterSVGFrame.cpp @@ -56,14 +56,14 @@ nsSVGOuterSVGFrame::UnregisterForeignObject(nsSVGForeignObjectFrame* aFrame) nsContainerFrame* NS_NewSVGOuterSVGFrame(nsIPresShell* aPresShell, nsStyleContext* aContext) -{ +{ return new (aPresShell) nsSVGOuterSVGFrame(aContext); } NS_IMPL_FRAMEARENA_HELPERS(nsSVGOuterSVGFrame) nsSVGOuterSVGFrame::nsSVGOuterSVGFrame(nsStyleContext* aContext) - : nsSVGOuterSVGFrameBase(aContext) + : nsSVGDisplayContainerFrame(aContext) , mFullZoom(aContext->PresContext()->GetFullZoom()) , mViewportInitialized(false) , mIsRootContent(false) @@ -112,7 +112,7 @@ nsSVGOuterSVGFrame::Init(nsIContent* aContent, AddStateBits(NS_FRAME_IS_NONDISPLAY); } - nsSVGOuterSVGFrameBase::Init(aContent, aParent, aPrevInFlow); + nsSVGDisplayContainerFrame::Init(aContent, aParent, aPrevInFlow); nsIDocument* doc = mContent->GetUncomposedDoc(); if (doc) { @@ -141,11 +141,10 @@ nsSVGOuterSVGFrame::Init(nsIContent* aContent, NS_QUERYFRAME_HEAD(nsSVGOuterSVGFrame) NS_QUERYFRAME_ENTRY(nsISVGSVGFrame) -NS_QUERYFRAME_TAIL_INHERITING(nsSVGOuterSVGFrameBase) +NS_QUERYFRAME_TAIL_INHERITING(nsSVGDisplayContainerFrame) //---------------------------------------------------------------------- // nsIFrame methods - //---------------------------------------------------------------------- // reflowing @@ -276,7 +275,7 @@ nsSVGOuterSVGFrame::GetIntrinsicRatio() NSToCoordRoundWithClamp(viewBoxHeight)); } - return nsSVGOuterSVGFrameBase::GetIntrinsicRatio(); + return nsSVGDisplayContainerFrame::GetIntrinsicRatio(); } /* virtual */ @@ -508,7 +507,7 @@ nsSVGOuterSVGFrame::DidReflow(nsPresContext* aPresContext, const nsHTMLReflowState* aReflowState, nsDidReflowStatus aStatus) { - nsSVGOuterSVGFrameBase::DidReflow(aPresContext,aReflowState,aStatus); + nsSVGDisplayContainerFrame::DidReflow(aPresContext,aReflowState,aStatus); // Make sure elements styled by :hover get updated if script/animation moves // them under or out from under the pointer: diff --git a/layout/svg/nsSVGOuterSVGFrame.h b/layout/svg/nsSVGOuterSVGFrame.h index eadcf3dc3a71..b8a5fded6d2a 100644 --- a/layout/svg/nsSVGOuterSVGFrame.h +++ b/layout/svg/nsSVGOuterSVGFrame.h @@ -17,10 +17,8 @@ class nsSVGForeignObjectFrame; //////////////////////////////////////////////////////////////////////// // nsSVGOuterSVGFrame class -typedef nsSVGDisplayContainerFrame nsSVGOuterSVGFrameBase; - -class nsSVGOuterSVGFrame final : public nsSVGOuterSVGFrameBase, - public nsISVGSVGFrame +class nsSVGOuterSVGFrame final : public nsSVGDisplayContainerFrame + , public nsISVGSVGFrame { friend nsContainerFrame* NS_NewSVGOuterSVGFrame(nsIPresShell* aPresShell, nsStyleContext* aContext);