Remove SVGElementInstance

Source/core/svg/SVGUseElement.h

Index: Source/core/svg/SVGUseElement.h
diff --git a/Source/core/svg/SVGUseElement.h b/Source/core/svg/SVGUseElement.h
index bcab8db031749869d5ad2a32deeae42f52dad2bf..20307c58ca514af8a510373a280a1319ba7c7498 100644
--- a/Source/core/svg/SVGUseElement.h
+++ b/Source/core/svg/SVGUseElement.h
@@ -31,7 +31,6 @@
 namespace WebCore {
 
 class DocumentResource;
-class SVGElementInstance;
 
 class SVGUseElement FINAL : public SVGGraphicsElement,
                             public SVGURIReference,
@@ -40,10 +39,7 @@ public:
     static PassRefPtrWillBeRawPtr<SVGUseElement> create(Document&);
     virtual ~SVGUseElement();
 
-    SVGElementInstance* instanceRoot();
-    SVGElementInstance* animatedInstanceRoot() const;
     void invalidateShadowTree();
-    void invalidateDependentShadowTrees();
 
     RenderObject* rendererClipChild() const;
 
@@ -80,38 +76,32 @@ private:
     virtual bool selfHasRelativeLengths() const OVERRIDE;
 
     // Instance tree handling
-    void buildInstanceTree(SVGElement* target, SVGElementInstance* targetInstance, bool& foundCycle, bool foundUse);
-    bool hasCycleUseReferencing(SVGUseElement*, SVGElementInstance* targetInstance, SVGElement*& newTarget);
-
-    // Shadow tree handling
-    void buildShadowTree(SVGElement* target, SVGElementInstance* targetInstance, ShadowRoot* shadowTreeRootElement);
-
-    void expandUseElementsInShadowTree(Node* element);
-    void expandSymbolElementsInShadowTree(Node* element);
-
-    // "Tree connector"
-    void associateInstancesWithShadowTreeElements(Node* target, SVGElementInstance* targetInstance);
+    void buildShadowTree(SVGElement* target, SVGElement* targetInstance, bool& foundProblem, bool foundUse);
+    bool hasCycleUseReferencing(SVGUseElement*, ContainerNode* targetInstance, SVGElement*& newTarget);
+    void expandUseElementsInShadowTree(SVGElement*, bool& foundProblem);
+    void expandSymbolElementsInShadowTree(SVGElement*);
 
     void transferUseAttributesToReplacedElement(SVGElement* from, SVGElement* to) const;
-    void transferEventListenersToShadowTree(SVGElement* shadowTreeTargetElement);
 
-    RefPtr<SVGAnimatedLength> m_x;
-    RefPtr<SVGAnimatedLength> m_y;
-    RefPtr<SVGAnimatedLength> m_width;
-    RefPtr<SVGAnimatedLength> m_height;
+    void invalidateDependentShadowTrees();
 
     bool resourceIsStillLoading();
     Document* externalDocument() const;
-    bool instanceTreeIsLoading(SVGElementInstance*);
+    bool instanceTreeIsLoading(SVGElement*);
     virtual void notifyFinished(Resource*) OVERRIDE;
     TreeScope* referencedScope() const;
     void setDocumentResource(ResourcePtr<DocumentResource>);
 
     virtual Timer<SVGElement>* svgLoadEventTimer() OVERRIDE { return &m_svgLoadEventTimer; }
 
+    RefPtr<SVGAnimatedLength> m_x;
+    RefPtr<SVGAnimatedLength> m_y;
+    RefPtr<SVGAnimatedLength> m_width;
+    RefPtr<SVGAnimatedLength> m_height;
+
     bool m_haveFiredLoadEvent;
     bool m_needsShadowTreeRecreation;
-    RefPtrWillBeMember<SVGElementInstance> m_targetElementInstance;
+    RefPtrWillBeMember<SVGElement> m_targetElementInstance;
     ResourcePtr<DocumentResource> m_resource;
     Timer<SVGElement> m_svgLoadEventTimer;
 };