Bug 1264837 Part 29 - Remove nsSVGMarkerFrameBase.
MozReview-Commit-ID: ECmFfNirWo3
--- a/layout/svg/nsSVGMarkerFrame.cpp
+++ b/layout/svg/nsSVGMarkerFrame.cpp
@@ -39,29 +39,29 @@ nsSVGMarkerFrame::AttributeChanged(int32
aAttribute == nsGkAtoms::markerWidth ||
aAttribute == nsGkAtoms::markerHeight ||
aAttribute == nsGkAtoms::orient ||
aAttribute == nsGkAtoms::preserveAspectRatio ||
aAttribute == nsGkAtoms::viewBox)) {
nsSVGEffects::InvalidateDirectRenderingObservers(this);
}
- return nsSVGMarkerFrameBase::AttributeChanged(aNameSpaceID,
- aAttribute, aModType);
+ return nsSVGContainerFrame::AttributeChanged(aNameSpaceID,
+ aAttribute, aModType);
}
#ifdef DEBUG
void
nsSVGMarkerFrame::Init(nsIContent* aContent,
nsContainerFrame* aParent,
nsIFrame* aPrevInFlow)
{
NS_ASSERTION(aContent->IsSVGElement(nsGkAtoms::marker), "Content is not an SVG marker");
- nsSVGMarkerFrameBase::Init(aContent, aParent, aPrevInFlow);
+ nsSVGContainerFrame::Init(aContent, aParent, aPrevInFlow);
}
#endif /* DEBUG */
nsIAtom *
nsSVGMarkerFrame::GetType() const
{
return nsGkAtoms::svgMarkerFrame;
}
--- a/layout/svg/nsSVGMarkerFrame.h
+++ b/layout/svg/nsSVGMarkerFrame.h
@@ -21,26 +21,24 @@ class nsSVGPathGeometryFrame;
namespace mozilla {
namespace dom {
class SVGSVGElement;
} // namespace dom
} // namespace mozilla
struct nsSVGMark;
-typedef nsSVGContainerFrame nsSVGMarkerFrameBase;
-
-class nsSVGMarkerFrame : public nsSVGMarkerFrameBase
+class nsSVGMarkerFrame : public nsSVGContainerFrame
{
friend class nsSVGMarkerAnonChildFrame;
friend nsContainerFrame*
NS_NewSVGMarkerFrame(nsIPresShell* aPresShell, nsStyleContext* aContext);
protected:
explicit nsSVGMarkerFrame(nsStyleContext* aContext)
- : nsSVGMarkerFrameBase(aContext)
+ : nsSVGContainerFrame(aContext)
, mMarkedFrame(nullptr)
, mInUse(false)
, mInUse2(false)
{
AddStateBits(NS_FRAME_IS_NONDISPLAY);
}
public: