Bug 1264837 Part 20 - Remove nsSVGFilterFrameBase. r=dholbert

MozReview-Commit-ID: 9VzfqZpVVVK

--HG--
extra : rebase_source : 898e9d47c1af204dbbdf9537ed59162d1a54399c

layout/svg/nsSVGFilterFrame.cpp

@@ -179,8 +179,8 @@ nsSVGFilterFrame::AttributeChanged(int32_t  aNameSpaceID,
     // And update whoever references us
     nsSVGEffects::InvalidateDirectRenderingObservers(this);
   }
-  return nsSVGFilterFrameBase::AttributeChanged(aNameSpaceID,
-                                                aAttribute, aModType);
+  return nsSVGContainerFrame::AttributeChanged(aNameSpaceID,
+                                               aAttribute, aModType);
 }
 
 #ifdef DEBUG
@@ -192,7 +192,7 @@ nsSVGFilterFrame::Init(nsIContent*       aContent,
   NS_ASSERTION(aContent->IsSVGElement(nsGkAtoms::filter),
                "Content is not an SVG filter");
 
-  nsSVGFilterFrameBase::Init(aContent, aParent, aPrevInFlow);
+  nsSVGContainerFrame::Init(aContent, aParent, aPrevInFlow);
 }
 #endif /* DEBUG */
 

layout/svg/nsSVGFilterFrame.h

@@ -27,17 +27,15 @@ class SVGFilterElement;
 } // namespace dom
 } // namespace mozilla
 
-typedef nsSVGContainerFrame nsSVGFilterFrameBase;
-
-class nsSVGFilterFrame : public nsSVGFilterFrameBase
+class nsSVGFilterFrame : public nsSVGContainerFrame
 {
   friend nsIFrame*
   NS_NewSVGFilterFrame(nsIPresShell* aPresShell, nsStyleContext* aContext);
 protected:
   explicit nsSVGFilterFrame(nsStyleContext* aContext)
-    : nsSVGFilterFrameBase(aContext),
-      mLoopFlag(false),
-      mNoHRefURI(false)
+    : nsSVGContainerFrame(aContext)
+    , mLoopFlag(false)
+    , mNoHRefURI(false)
   {
     AddStateBits(NS_FRAME_IS_NONDISPLAY);
   }