From 35ba281a41bdbbfb38ac94120bdd2d8f9df1eef9 Mon Sep 17 00:00:00 2001 From: Ting-Yu Lin Date: Mon, 18 Apr 2016 15:17:35 +0800 Subject: [PATCH] Bug 1264837 Part 25 - Remove nsSVGLinearGradientFrameBase. r=dholbert MozReview-Commit-ID: 5o57Ai4Wbsx --HG-- extra : rebase_source : 0e47dfb900912154be8f2fc747d26861c2597ead --- layout/svg/nsSVGGradientFrame.cpp | 5 ++--- layout/svg/nsSVGGradientFrame.h | 8 +++----- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/layout/svg/nsSVGGradientFrame.cpp b/layout/svg/nsSVGGradientFrame.cpp index d46f60b10eab..d9cbd6c839b8 100644 --- a/layout/svg/nsSVGGradientFrame.cpp +++ b/layout/svg/nsSVGGradientFrame.cpp @@ -405,7 +405,7 @@ nsSVGLinearGradientFrame::Init(nsIContent* aContent, NS_ASSERTION(aContent->IsSVGElement(nsGkAtoms::linearGradient), "Content is not an SVG linearGradient"); - nsSVGLinearGradientFrameBase::Init(aContent, aParent, aPrevInFlow); + nsSVGGradientFrame::Init(aContent, aParent, aPrevInFlow); } #endif /* DEBUG */ @@ -474,8 +474,7 @@ nsSVGLinearGradientFrame::GetLinearGradientWithLength(uint32_t aIndex, return thisElement; } - return nsSVGLinearGradientFrameBase::GetLinearGradientWithLength(aIndex, - aDefault); + return nsSVGGradientFrame::GetLinearGradientWithLength(aIndex, aDefault); } bool diff --git a/layout/svg/nsSVGGradientFrame.h b/layout/svg/nsSVGGradientFrame.h index e048bc54d173..02342488aaf3 100644 --- a/layout/svg/nsSVGGradientFrame.h +++ b/layout/svg/nsSVGGradientFrame.h @@ -124,15 +124,13 @@ private: // 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