Bug 1264837 Part 18 - Remove nsSVGClipPathFrameBase.
MozReview-Commit-ID: It4pCnQtjDi
--- a/layout/svg/nsSVGClipPathFrame.cpp
+++ b/layout/svg/nsSVGClipPathFrame.cpp
@@ -413,30 +413,30 @@ nsSVGClipPathFrame::AttributeChanged(int
nsSVGUtils::NotifyChildrenOfSVGChange(this,
nsISVGChildFrame::TRANSFORM_CHANGED);
}
if (aAttribute == nsGkAtoms::clipPathUnits) {
nsSVGEffects::InvalidateDirectRenderingObservers(this);
}
}
- return nsSVGClipPathFrameBase::AttributeChanged(aNameSpaceID,
- aAttribute, aModType);
+ return nsSVGContainerFrame::AttributeChanged(aNameSpaceID,
+ aAttribute, aModType);
}
void
nsSVGClipPathFrame::Init(nsIContent* aContent,
nsContainerFrame* aParent,
nsIFrame* aPrevInFlow)
{
NS_ASSERTION(aContent->IsSVGElement(nsGkAtoms::clipPath),
"Content is not an SVG clipPath!");
AddStateBits(NS_STATE_SVG_CLIPPATH_CHILD);
- nsSVGClipPathFrameBase::Init(aContent, aParent, aPrevInFlow);
+ nsSVGContainerFrame::Init(aContent, aParent, aPrevInFlow);
}
nsIAtom *
nsSVGClipPathFrame::GetType() const
{
return nsGkAtoms::svgClipPathFrame;
}
--- a/layout/svg/nsSVGClipPathFrame.h
+++ b/layout/svg/nsSVGClipPathFrame.h
@@ -10,29 +10,27 @@
#include "gfxMatrix.h"
#include "mozilla/Attributes.h"
#include "nsSVGContainerFrame.h"
#include "nsSVGUtils.h"
class gfxContext;
class nsISVGChildFrame;
-typedef nsSVGContainerFrame nsSVGClipPathFrameBase;
-
-class nsSVGClipPathFrame : public nsSVGClipPathFrameBase
+class nsSVGClipPathFrame : public nsSVGContainerFrame
{
friend nsIFrame*
NS_NewSVGClipPathFrame(nsIPresShell* aPresShell, nsStyleContext* aContext);
typedef mozilla::gfx::Matrix Matrix;
typedef mozilla::gfx::SourceSurface SourceSurface;
protected:
explicit nsSVGClipPathFrame(nsStyleContext* aContext)
- : nsSVGClipPathFrameBase(aContext)
+ : nsSVGContainerFrame(aContext)
, mReferencing(mozilla::AutoReferenceLimiter::notReferencing)
{
AddStateBits(NS_FRAME_IS_NONDISPLAY);
}
public:
NS_DECL_FRAMEARENA_HELPERS