Bug 1264837 Part 40 - Remove SVGFEContainerFrameBase.
MozReview-Commit-ID: HOISrUkVbdt
--- a/layout/svg/SVGFEContainerFrame.cpp
+++ b/layout/svg/SVGFEContainerFrame.cpp
@@ -6,39 +6,37 @@
// Keep in (case-insensitive) order:
#include "nsContainerFrame.h"
#include "nsGkAtoms.h"
#include "nsIFrame.h"
#include "nsLiteralString.h"
#include "nsSVGEffects.h"
#include "nsSVGFilters.h"
-typedef nsContainerFrame SVGFEContainerFrameBase;
-
/*
* This frame is used by filter primitive elements that
* have special child elements that provide parameters.
*/
-class SVGFEContainerFrame : public SVGFEContainerFrameBase
+class SVGFEContainerFrame : public nsContainerFrame
{
friend nsIFrame*
NS_NewSVGFEContainerFrame(nsIPresShell* aPresShell, nsStyleContext* aContext);
protected:
explicit SVGFEContainerFrame(nsStyleContext* aContext)
- : SVGFEContainerFrameBase(aContext)
+ : nsContainerFrame(aContext)
{
AddStateBits(NS_FRAME_SVG_LAYOUT | NS_FRAME_IS_NONDISPLAY);
}
public:
NS_DECL_FRAMEARENA_HELPERS
virtual bool IsFrameOfType(uint32_t aFlags) const override
{
- return SVGFEContainerFrameBase::IsFrameOfType(
+ return nsContainerFrame::IsFrameOfType(
aFlags & ~(nsIFrame::eSVG | nsIFrame::eSVGContainer));
}
#ifdef DEBUG_FRAME_DUMP
virtual nsresult GetFrameName(nsAString& aResult) const override
{
return MakeFrameName(NS_LITERAL_STRING("SVGFEContainer"), aResult);
}
@@ -79,17 +77,17 @@ void
SVGFEContainerFrame::Init(nsIContent* aContent,
nsContainerFrame* aParent,
nsIFrame* aPrevInFlow)
{
NS_ASSERTION(aContent->IsNodeOfType(nsINode::eFILTER),
"Trying to construct an SVGFEContainerFrame for a "
"content element that doesn't support the right interfaces");
- SVGFEContainerFrameBase::Init(aContent, aParent, aPrevInFlow);
+ nsContainerFrame::Init(aContent, aParent, aPrevInFlow);
}
#endif /* DEBUG */
nsIAtom *
SVGFEContainerFrame::GetType() const
{
return nsGkAtoms::svgFEContainerFrame;
}
@@ -101,11 +99,10 @@ SVGFEContainerFrame::AttributeChanged(in
{
nsSVGFE *element = static_cast<nsSVGFE*>(mContent);
if (element->AttributeAffectsRendering(aNameSpaceID, aAttribute)) {
MOZ_ASSERT(GetParent()->GetType() == nsGkAtoms::svgFilterFrame,
"Observers observe the filter, so that's what we must invalidate");
nsSVGEffects::InvalidateDirectRenderingObservers(GetParent());
}
- return SVGFEContainerFrameBase::AttributeChanged(aNameSpaceID,
- aAttribute, aModType);
+ return nsContainerFrame::AttributeChanged(aNameSpaceID, aAttribute, aModType);
}