From 40eb55de275e69ec607aebface9ad9f926b49c0c Mon Sep 17 00:00:00 2001 From: Ting-Yu Lin Date: Mon, 18 Apr 2016 15:38:47 +0800 Subject: [PATCH] Bug 1264837 Part 35 - Remove nsSVGPathGeometryFrameBase. r=dholbert MozReview-Commit-ID: 65TI0SnEXax --HG-- extra : rebase_source : 94a5f99dc750e344c632f3ceac93e55370bae076 --- layout/svg/nsSVGPathGeometryFrame.cpp | 6 +++--- layout/svg/nsSVGPathGeometryFrame.h | 10 ++++------ 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/layout/svg/nsSVGPathGeometryFrame.cpp b/layout/svg/nsSVGPathGeometryFrame.cpp index 83099f1cce5d..04392f46cc97 100644 --- a/layout/svg/nsSVGPathGeometryFrame.cpp +++ b/layout/svg/nsSVGPathGeometryFrame.cpp @@ -50,7 +50,7 @@ NS_IMPL_FRAMEARENA_HELPERS(nsSVGPathGeometryFrame) NS_QUERYFRAME_HEAD(nsSVGPathGeometryFrame) NS_QUERYFRAME_ENTRY(nsISVGChildFrame) NS_QUERYFRAME_ENTRY(nsSVGPathGeometryFrame) -NS_QUERYFRAME_TAIL_INHERITING(nsSVGPathGeometryFrameBase) +NS_QUERYFRAME_TAIL_INHERITING(nsFrame) //---------------------------------------------------------------------- // Display list item: @@ -123,7 +123,7 @@ nsSVGPathGeometryFrame::Init(nsIContent* aContent, nsIFrame* aPrevInFlow) { AddStateBits(aParent->GetStateBits() & NS_STATE_SVG_CLIPPATH_CHILD); - nsSVGPathGeometryFrameBase::Init(aContent, aParent, aPrevInFlow); + nsFrame::Init(aContent, aParent, aPrevInFlow); } nsresult @@ -150,7 +150,7 @@ nsSVGPathGeometryFrame::AttributeChanged(int32_t aNameSpaceID, /* virtual */ void nsSVGPathGeometryFrame::DidSetStyleContext(nsStyleContext* aOldStyleContext) { - nsSVGPathGeometryFrameBase::DidSetStyleContext(aOldStyleContext); + nsFrame::DidSetStyleContext(aOldStyleContext); if (aOldStyleContext) { auto oldStyleEffects = aOldStyleContext->PeekStyleEffects(); diff --git a/layout/svg/nsSVGPathGeometryFrame.h b/layout/svg/nsSVGPathGeometryFrame.h index ac895db9c3ab..d1764f685a4c 100644 --- a/layout/svg/nsSVGPathGeometryFrame.h +++ b/layout/svg/nsSVGPathGeometryFrame.h @@ -32,10 +32,8 @@ class nsSVGMarkerProperty; struct nsRect; -typedef nsFrame nsSVGPathGeometryFrameBase; - -class nsSVGPathGeometryFrame : public nsSVGPathGeometryFrameBase, - public nsISVGChildFrame +class nsSVGPathGeometryFrame : public nsFrame + , public nsISVGChildFrame { typedef mozilla::gfx::DrawTarget DrawTarget; @@ -46,7 +44,7 @@ class nsSVGPathGeometryFrame : public nsSVGPathGeometryFrameBase, protected: explicit nsSVGPathGeometryFrame(nsStyleContext* aContext) - : nsSVGPathGeometryFrameBase(aContext) + : nsFrame(aContext) { AddStateBits(NS_FRAME_SVG_LAYOUT | NS_FRAME_MAY_BE_TRANSFORMED); } @@ -63,7 +61,7 @@ public: virtual bool IsFrameOfType(uint32_t aFlags) const override { - return nsSVGPathGeometryFrameBase::IsFrameOfType(aFlags & ~(nsIFrame::eSVG | nsIFrame::eSVGGeometry)); + return nsFrame::IsFrameOfType(aFlags & ~(nsIFrame::eSVG | nsIFrame::eSVGGeometry)); } virtual nsresult AttributeChanged(int32_t aNameSpaceID,