Backed out changeset 1cf12e699dc7 (bug 846028) for reftest crashes on a CLOSED TREE.

image/src/VectorImage.cpp

@@ -55,12 +55,6 @@ public:
 #endif
   }
 
-  void ResumeListening()
-  {
-    // GetReferencedElement adds us back to our target's observer list.
-    GetReferencedElement();
-  }
-
   virtual ~SVGRootRenderingObserver()
   {
     StopListening();
@@ -88,9 +82,12 @@ protected:
       mVectorImage->InvalidateObserver();
     }
 
-    // We may have been removed from the observer list by our caller. Rather
-    // than add ourselves back here, we wait until Draw gets called, ensuring
-    // that we coalesce invalidations between Draw calls.
+    // Our caller might've removed us from rendering-observer list.
+    // Add ourselves back!
+    if (!mInObserverList) {
+      nsSVGEffects::AddRenderingObserver(elem, this);
+      mInObserverList = true;
+    }
   }
 
   // Private data
@@ -764,11 +761,6 @@ VectorImage::Draw(gfxContext* aContext,
                              subimage, sourceRect, imageRect, aFill,
                              gfxASurface::ImageFormatARGB32, aFilter);
 
-  // Allow ourselves to fire another FrameChanged and OnStopFrame event.
-  MOZ_ASSERT(mRenderingObserver, "Should have initialized rendering observer "
-                                 "in OnSVGDocumentLoaded");
-  mRenderingObserver->ResumeListening();
-
   mIsDrawing = false;
   return NS_OK;
 }