Bug 319786 - backout unrelated changes

layout/svg/base/src/nsSVGForeignObjectFrame.cpp

@@ -86,12 +86,6 @@ nsSVGForeignObjectFrame::nsSVGForeignObjectFrame(nsStyleContext* aContext)
 {
 }
 
-void nsSVGForeignObjectFrame::Destroy()
-{
-  nsSVGUtils::StyleEffects(this);
-  nsSVGForeignObjectFrameBase::Destroy();
-}
-
 //----------------------------------------------------------------------
 // nsISupports methods
 

layout/svg/base/src/nsSVGForeignObjectFrame.h

@@ -60,7 +60,6 @@ class nsSVGForeignObjectFrame : public nsSVGForeignObjectFrameBase,
   NS_NewSVGForeignObjectFrame(nsIPresShell* aPresShell, nsIContent* aContent, nsStyleContext* aContext);
 protected:
   nsSVGForeignObjectFrame(nsStyleContext* aContext);
-  virtual void Destroy();
   
   // nsISupports interface:
   NS_IMETHOD QueryInterface(const nsIID& aIID, void** aInstancePtr);

layout/svg/base/src/nsSVGGFrame.cpp

@@ -72,12 +72,6 @@ NS_NewSVGGFrame(nsIPresShell* aPresShell, nsIContent* aContent, nsStyleContext*
   return new (aPresShell) nsSVGGFrame(aContext);
 }
 
-void nsSVGGFrame::Destroy()
-{
-  nsSVGUtils::StyleEffects(this);
-  nsSVGGFrameBase::Destroy();
-}
-
 nsIAtom *
 nsSVGGFrame::GetType() const
 {

layout/svg/base/src/nsSVGGFrame.h

@@ -54,7 +54,6 @@ class nsSVGGFrame : public nsSVGGFrameBase,
 public:
   nsSVGGFrame(nsStyleContext* aContext) :
     nsSVGGFrameBase(aContext), mPropagateTransform(PR_TRUE) {}
-  virtual void Destroy();
 
   /**
    * Get the "type" of the frame

layout/svg/base/src/nsSVGInnerSVGFrame.cpp

@@ -57,7 +57,6 @@ class nsSVGInnerSVGFrame : public nsSVGInnerSVGFrameBase,
   NS_NewSVGInnerSVGFrame(nsIPresShell* aPresShell, nsIContent* aContent, nsStyleContext* aContext);
 protected:
   nsSVGInnerSVGFrame(nsStyleContext* aContext);
-  virtual void Destroy();
   
    // nsISupports interface:
   NS_IMETHOD QueryInterface(const nsIID& aIID, void** aInstancePtr);
@@ -139,12 +138,6 @@ nsSVGInnerSVGFrame::nsSVGInnerSVGFrame(nsStyleContext* aContext) :
 #endif
 }
 
-void nsSVGInnerSVGFrame::Destroy()
-{
-  nsSVGUtils::StyleEffects(this);
-  nsSVGInnerSVGFrameBase::Destroy();
-}
-
 void
 nsSVGInnerSVGFrame::UpdateCoordCtx()
 {

layout/svg/base/src/nsSVGPathGeometryFrame.h

@@ -64,7 +64,7 @@ class nsSVGPathGeometryFrame : public nsSVGPathGeometryFrameBase,
 {
 public:
   nsSVGPathGeometryFrame(nsStyleContext* aContext);
-  ~nsSVGPathGeometryFrame();
+  virtual ~nsSVGPathGeometryFrame();
 
    // nsISupports interface:
   NS_IMETHOD QueryInterface(const nsIID& aIID, void** aInstancePtr);
@@ -127,7 +127,6 @@ protected:
 private:
   void Render(nsISVGRendererCanvas *aCanvas);
   void GeneratePath(cairo_t *ctx, nsISVGCairoCanvas* aCanvas);
-  void RemovePathProperties();
 
   /*
    * Check for what cairo returns for the fill extents of a degenerate path

layout/svg/base/src/nsSVGUtils.cpp

@@ -59,6 +59,7 @@
 #include "nsISVGRenderer.h"
 #include "nsSVGFilterFrame.h"
 #include "nsINameSpaceManager.h"
+#include "nsISVGChildFrame.h"
 #include "nsIDOMSVGPoint.h"
 #include "nsSVGPoint.h"
 #include "nsDOMError.h"