Bug 1264837 Part 26 - Remove nsSVGRadialGradientFrameBase.
MozReview-Commit-ID: DPgBVVoWied
--- a/layout/svg/nsSVGGradientFrame.cpp
+++ b/layout/svg/nsSVGGradientFrame.cpp
@@ -508,17 +508,17 @@ nsSVGLinearGradientFrame::CreateGradient
void
nsSVGRadialGradientFrame::Init(nsIContent* aContent,
nsContainerFrame* aParent,
nsIFrame* aPrevInFlow)
{
NS_ASSERTION(aContent->IsSVGElement(nsGkAtoms::radialGradient),
"Content is not an SVG radialGradient");
- nsSVGRadialGradientFrameBase::Init(aContent, aParent, aPrevInFlow);
+ nsSVGGradientFrame::Init(aContent, aParent, aPrevInFlow);
}
#endif /* DEBUG */
nsIAtom*
nsSVGRadialGradientFrame::GetType() const
{
return nsGkAtoms::svgRadialGradientFrame;
}
@@ -595,18 +595,17 @@ nsSVGRadialGradientFrame::GetRadialGradi
dom::SVGRadialGradientElement* thisElement =
static_cast<dom::SVGRadialGradientElement*>(mContent);
const nsSVGLength2 &length = thisElement->mLengthAttributes[aIndex];
if (length.IsExplicitlySet()) {
return thisElement;
}
- return nsSVGRadialGradientFrameBase::GetRadialGradientWithLength(aIndex,
- aDefault);
+ return nsSVGGradientFrame::GetRadialGradientWithLength(aIndex, aDefault);
}
bool
nsSVGRadialGradientFrame::GradientVectorLengthIsZero()
{
return GetLengthValue(dom::SVGRadialGradientElement::ATTR_R) == 0;
}
--- a/layout/svg/nsSVGGradientFrame.h
+++ b/layout/svg/nsSVGGradientFrame.h
@@ -162,25 +162,23 @@ protected:
virtual bool GradientVectorLengthIsZero() override;
virtual already_AddRefed<gfxPattern> CreateGradient() override;
};
// -------------------------------------------------------------------------
// Radial Gradients
// -------------------------------------------------------------------------
-typedef nsSVGGradientFrame nsSVGRadialGradientFrameBase;
-
-class nsSVGRadialGradientFrame : public nsSVGRadialGradientFrameBase
+class nsSVGRadialGradientFrame : public nsSVGGradientFrame
{
friend nsIFrame* NS_NewSVGRadialGradientFrame(nsIPresShell* aPresShell,
nsStyleContext* aContext);
protected:
- explicit nsSVGRadialGradientFrame(nsStyleContext* aContext) :
- nsSVGRadialGradientFrameBase(aContext) {}
+ explicit nsSVGRadialGradientFrame(nsStyleContext* aContext)
+ : nsSVGGradientFrame(aContext) {}
public:
NS_DECL_FRAMEARENA_HELPERS
// nsIFrame interface:
#ifdef DEBUG
virtual void Init(nsIContent* aContent,
nsContainerFrame* aParent,