Bug 1264837 Part 24 - Remove nsSVGGradientFrameBase.
MozReview-Commit-ID: CGIBpG8buVU
--- a/layout/svg/nsSVGGradientFrame.cpp
+++ b/layout/svg/nsSVGGradientFrame.cpp
@@ -43,20 +43,20 @@ public:
private:
nsSVGGradientFrame *mFrame;
MOZ_DECL_USE_GUARD_OBJECT_NOTIFIER
};
//----------------------------------------------------------------------
// Implementation
-nsSVGGradientFrame::nsSVGGradientFrame(nsStyleContext* aContext) :
- nsSVGGradientFrameBase(aContext),
- mLoopFlag(false),
- mNoHRefURI(false)
+nsSVGGradientFrame::nsSVGGradientFrame(nsStyleContext* aContext)
+ : nsSVGPaintServerFrame(aContext)
+ , mLoopFlag(false)
+ , mNoHRefURI(false)
{
}
//----------------------------------------------------------------------
// nsIFrame methods:
nsresult
nsSVGGradientFrame::AttributeChanged(int32_t aNameSpaceID,
@@ -72,18 +72,18 @@ nsSVGGradientFrame::AttributeChanged(int
aAttribute == nsGkAtoms::href) {
// Blow away our reference, if any
Properties().Delete(nsSVGEffects::HrefProperty());
mNoHRefURI = false;
// And update whoever references us
nsSVGEffects::InvalidateDirectRenderingObservers(this);
}
- return nsSVGGradientFrameBase::AttributeChanged(aNameSpaceID,
- aAttribute, aModType);
+ return nsSVGPaintServerFrame::AttributeChanged(aNameSpaceID,
+ aAttribute, aModType);
}
//----------------------------------------------------------------------
uint16_t
nsSVGGradientFrame::GetEnumValue(uint32_t aIndex, nsIContent *aDefault)
{
const nsSVGEnum& thisEnum =
--- a/layout/svg/nsSVGGradientFrame.h
+++ b/layout/svg/nsSVGGradientFrame.h
@@ -26,23 +26,21 @@ namespace mozilla {
class nsSVGAnimatedTransformList;
namespace dom {
class SVGLinearGradientElement;
class SVGRadialGradientElement;
} // namespace dom
} // namespace mozilla
-typedef nsSVGPaintServerFrame nsSVGGradientFrameBase;
-
/**
* Gradients can refer to other gradients. We create an nsSVGPaintingProperty
* with property type nsGkAtoms::href to track the referenced gradient.
*/
-class nsSVGGradientFrame : public nsSVGGradientFrameBase
+class nsSVGGradientFrame : public nsSVGPaintServerFrame
{
typedef mozilla::gfx::ExtendMode ExtendMode;
protected:
explicit nsSVGGradientFrame(nsStyleContext* aContext);
public:
NS_DECL_ABSTRACT_FRAME(nsSVGGradientFrame)