Merge 111601

Source/WebCore/rendering/svg/RenderSVGRoot.h

Index: Source/WebCore/rendering/svg/RenderSVGRoot.h
===================================================================
--- Source/WebCore/rendering/svg/RenderSVGRoot.h	(revision 112624)
+++ Source/WebCore/rendering/svg/RenderSVGRoot.h	(working copy)
@@ -55,6 +55,10 @@
 
     virtual bool hasRelativeDimensions() const;
 
+    // The flag is cleared at the beginning of each layout() pass. Elements then call this
+    // method during layout when they are invalidated by a filter.
+    static void addResourceForClientInvalidation(RenderSVGResourceContainer*);
+
 private:
     virtual RenderObjectChildList* virtualChildren() { return children(); }
     virtual const RenderObjectChildList* virtualChildren() const { return children(); }
@@ -100,6 +104,7 @@
     FloatRect m_repaintBoundingBox;
     mutable AffineTransform m_localToParentTransform;
     AffineTransform m_localToBorderBoxTransform;
+    HashSet<RenderSVGResourceContainer*> m_resourcesNeedingToInvalidateClients;
     bool m_isLayoutSizeChanged : 1;
     bool m_needsBoundariesOrTransformUpdate : 1;
 };