Bug 1264837 Part 42 - Remove SVGFELeafFrameBase. r=dholbert

MozReview-Commit-ID: H40idRvWopf

--HG--
extra : rebase_source : b13c255342473ef0df78fcf60c4df823b468cb12
This commit is contained in:
Ting-Yu Lin 2016-04-18 15:50:08 +08:00
Родитель edcf624a82
Коммит f17395df8b
1 изменённых файлов: 5 добавлений и 8 удалений

Просмотреть файл

@ -10,19 +10,17 @@
#include "nsSVGEffects.h"
#include "nsSVGFilters.h"
typedef nsFrame SVGFELeafFrameBase;
/*
* This frame is used by filter primitive elements that don't
* have special child elements that provide parameters.
*/
class SVGFELeafFrame : public SVGFELeafFrameBase
class SVGFELeafFrame : public nsFrame
{
friend nsIFrame*
NS_NewSVGFELeafFrame(nsIPresShell* aPresShell, nsStyleContext* aContext);
protected:
explicit SVGFELeafFrame(nsStyleContext* aContext)
: SVGFELeafFrameBase(aContext)
: nsFrame(aContext)
{
AddStateBits(NS_FRAME_SVG_LAYOUT | NS_FRAME_IS_NONDISPLAY);
}
@ -38,7 +36,7 @@ public:
virtual bool IsFrameOfType(uint32_t aFlags) const override
{
return SVGFELeafFrameBase::IsFrameOfType(aFlags & ~(nsIFrame::eSVG));
return nsFrame::IsFrameOfType(aFlags & ~(nsIFrame::eSVG));
}
#ifdef DEBUG_FRAME_DUMP
@ -83,7 +81,7 @@ SVGFELeafFrame::Init(nsIContent* aContent,
"Trying to construct an SVGFELeafFrame for a "
"content element that doesn't support the right interfaces");
SVGFELeafFrameBase::Init(aContent, aParent, aPrevInFlow);
nsFrame::Init(aContent, aParent, aPrevInFlow);
}
#endif /* DEBUG */
@ -105,6 +103,5 @@ SVGFELeafFrame::AttributeChanged(int32_t aNameSpaceID,
nsSVGEffects::InvalidateDirectRenderingObservers(GetParent());
}
return SVGFELeafFrameBase::AttributeChanged(aNameSpaceID,
aAttribute, aModType);
return nsFrame::AttributeChanged(aNameSpaceID, aAttribute, aModType);
}