Bug 461131 - Remove unused mFilterRect variable from nsSVGFilterProperty. r+sr=roc

layout/svg/base/src/nsSVGContainerFrame.cpp

@@ -238,10 +238,6 @@ nsSVGDisplayContainerFrame::NotifySVGChanged(PRUint32 aFlags)
   NS_ASSERTION(aFlags & (TRANSFORM_CHANGED | COORD_CONTEXT_CHANGED),
                "Invalidation logic may need adjusting");
 
-  if (!(aFlags & SUPPRESS_INVALIDATION) &&
-      !(GetStateBits() & NS_STATE_SVG_NONDISPLAY_CHILD))
-    nsSVGUtils::UpdateFilterRegion(this);
-
   nsSVGUtils::NotifyChildrenOfSVGChange(this, aFlags);
 }
 

layout/svg/base/src/nsSVGEffects.cpp

@@ -176,13 +176,6 @@ NS_IMPL_ISUPPORTS_INHERITED1(nsSVGFilterProperty,
                              nsSVGRenderingObserver,
                              nsISVGFilterProperty)
 
-nsSVGFilterProperty::nsSVGFilterProperty(nsIURI *aURI,
-                                         nsIFrame *aFilteredFrame)
-  : nsSVGRenderingObserver(aURI, aFilteredFrame)
-{
-  UpdateRect();
-}
-
 nsSVGFilterFrame *
 nsSVGFilterProperty::GetFilterFrame()
 {
@@ -190,18 +183,6 @@ nsSVGFilterProperty::GetFilterFrame()
     (GetReferencedFrame(nsGkAtoms::svgFilterFrame, nsnull));
 }
 
-void
-nsSVGFilterProperty::UpdateRect()
-{
-  nsSVGFilterFrame *filter = GetFilterFrame();
-  if (filter) {
-    mFilterRect = filter->GetFilterBBox(mFrame, nsnull);
-    mFilterRect.ScaleRoundOut(filter->PresContext()->AppUnitsPerDevPixel());
-  } else {
-    mFilterRect = nsRect();
-  }
-}
-
 static void
 InvalidateAllContinuations(nsIFrame* aFrame)
 {

layout/svg/base/src/nsSVGEffects.h

@@ -125,13 +125,13 @@ protected:
 class nsSVGFilterProperty :
   public nsSVGRenderingObserver, public nsISVGFilterProperty {
 public:
-  nsSVGFilterProperty(nsIURI *aURI, nsIFrame *aFilteredFrame);
+  nsSVGFilterProperty(nsIURI *aURI, nsIFrame *aFilteredFrame)
+    : nsSVGRenderingObserver(aURI, aFilteredFrame) {}
 
   /**
    * @return the filter frame, or null if there is no filter frame
    */
   nsSVGFilterFrame *GetFilterFrame();
-  void UpdateRect();
 
   // nsISupports
   NS_DECL_ISUPPORTS
@@ -142,12 +142,6 @@ public:
 private:
   // nsSVGRenderingObserver
   virtual void DoUpdate();
-  
-  // Tracks a bounding box for the filtered mFrame. We need this so that
-  // if the filter changes we know how much to redraw. We only need this
-  // for SVG frames since regular frames have an overflow area
-  // that includes the filtered area.
-  nsRect mFilterRect;
 };
 
 class nsSVGMarkerProperty : public nsSVGRenderingObserver {

layout/svg/base/src/nsSVGForeignObjectFrame.cpp

@@ -374,8 +374,6 @@ nsSVGForeignObjectFrame::UpdateCoveredRegion()
   // we should not unconditionally reflow in AttributeChanged
   mRect = GetTransformedRegion(x, y, w, h, ctm, PresContext());
 
-  nsSVGUtils::UpdateFilterRegion(this);
-
   return NS_OK;
 }
 

layout/svg/base/src/nsSVGPathGeometryFrame.cpp

@@ -274,7 +274,6 @@ nsSVGPathGeometryFrame::UpdateCoveredRegion()
   // Add in markers
   mRect = GetCoveredRegion();
 
-  nsSVGUtils::UpdateFilterRegion(this);
   return NS_OK;
 }
 

layout/svg/base/src/nsSVGUtils.cpp

@@ -584,16 +584,6 @@ nsSVGUtils::FindFilterInvalidation(nsIFrame *aFrame, const nsRect& aRect)
   return rect;
 }
 
-void
-nsSVGUtils::UpdateFilterRegion(nsIFrame *aFrame)
-{
-  nsSVGEffects::EffectProperties props =
-    nsSVGEffects::GetEffectProperties(aFrame);
-  if (props.mFilter) {
-    props.mFilter->UpdateRect();
-  }
-}
-
 void
 nsSVGUtils::UpdateGraphic(nsISVGChildFrame *aSVGFrame)
 {

layout/svg/base/src/nsSVGUtils.h

@@ -259,11 +259,6 @@ public:
    */
   static nsRect FindFilterInvalidation(nsIFrame *aFrame, const nsRect& aRect);
 
-  /*
-   * Update the filter invalidation region for this frame, if relevant.
-   */
-  static void UpdateFilterRegion(nsIFrame *aFrame);
-
   /*
    * Update the area covered by the frame
    */