Bug 1264837 Part 25 - Remove nsSVGLinearGradientFrameBase.
MozReview-Commit-ID: 5o57Ai4Wbsx
--- a/layout/svg/nsSVGGradientFrame.cpp
+++ b/layout/svg/nsSVGGradientFrame.cpp
@@ -400,17 +400,17 @@ nsSVGGradientFrame::GetStopFrames(nsTArr
void
nsSVGLinearGradientFrame::Init(nsIContent* aContent,
nsContainerFrame* aParent,
nsIFrame* aPrevInFlow)
{
NS_ASSERTION(aContent->IsSVGElement(nsGkAtoms::linearGradient),
"Content is not an SVG linearGradient");
- nsSVGLinearGradientFrameBase::Init(aContent, aParent, aPrevInFlow);
+ nsSVGGradientFrame::Init(aContent, aParent, aPrevInFlow);
}
#endif /* DEBUG */
nsIAtom*
nsSVGLinearGradientFrame::GetType() const
{
return nsGkAtoms::svgLinearGradientFrame;
}
@@ -469,18 +469,17 @@ nsSVGLinearGradientFrame::GetLinearGradi
dom::SVGLinearGradientElement* thisElement =
static_cast<dom::SVGLinearGradientElement*>(mContent);
const nsSVGLength2 &length = thisElement->mLengthAttributes[aIndex];
if (length.IsExplicitlySet()) {
return thisElement;
}
- return nsSVGLinearGradientFrameBase::GetLinearGradientWithLength(aIndex,
- aDefault);
+ return nsSVGGradientFrame::GetLinearGradientWithLength(aIndex, aDefault);
}
bool
nsSVGLinearGradientFrame::GradientVectorLengthIsZero()
{
return GetLengthValue(dom::SVGLinearGradientElement::ATTR_X1) ==
GetLengthValue(dom::SVGLinearGradientElement::ATTR_X2) &&
GetLengthValue(dom::SVGLinearGradientElement::ATTR_Y1) ==
--- a/layout/svg/nsSVGGradientFrame.h
+++ b/layout/svg/nsSVGGradientFrame.h
@@ -119,25 +119,23 @@ private:
bool mNoHRefURI;
};
// -------------------------------------------------------------------------
// Linear Gradients
// -------------------------------------------------------------------------
-typedef nsSVGGradientFrame nsSVGLinearGradientFrameBase;
-
-class nsSVGLinearGradientFrame : public nsSVGLinearGradientFrameBase
+class nsSVGLinearGradientFrame : public nsSVGGradientFrame
{
friend nsIFrame* NS_NewSVGLinearGradientFrame(nsIPresShell* aPresShell,
nsStyleContext* aContext);
protected:
- explicit nsSVGLinearGradientFrame(nsStyleContext* aContext) :
- nsSVGLinearGradientFrameBase(aContext) {}
+ explicit nsSVGLinearGradientFrame(nsStyleContext* aContext)
+ : nsSVGGradientFrame(aContext) {}
public:
NS_DECL_FRAMEARENA_HELPERS
// nsIFrame interface:
#ifdef DEBUG
virtual void Init(nsIContent* aContent,
nsContainerFrame* aParent,