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..6b88ea41b4e74aad967d3179cd9ee3b2d08cab6a 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,8 +39,6 @@ public:
     static PassRefPtrWillBeRawPtr<SVGUseElement> create(Document&);
     virtual ~SVGUseElement();
 
-    SVGElementInstance* instanceRoot();
-    SVGElementInstance* animatedInstanceRoot() const;
     void invalidateShadowTree();
     void invalidateDependentShadowTrees();
 
@@ -80,18 +77,11 @@ 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 buildShadowTree(SVGElement* target, SVGElement* targetInstance, bool& foundProblem, bool foundUse);
+    bool hasCycleUseReferencing(SVGUseElement*, ContainerNode* targetInstance, SVGElement*& newTarget);
+    void expandUseElementsInShadowTree(Node* element, bool& foundProblem);
     void expandSymbolElementsInShadowTree(Node* element);
 
-    // "Tree connector"
-    void associateInstancesWithShadowTreeElements(Node* target, SVGElementInstance* targetInstance);
-
     void transferUseAttributesToReplacedElement(SVGElement* from, SVGElement* to) const;
     void transferEventListenersToShadowTree(SVGElement* shadowTreeTargetElement);
 
@@ -102,7 +92,7 @@ private:
 
     bool resourceIsStillLoading();
     Document* externalDocument() const;
-    bool instanceTreeIsLoading(SVGElementInstance*);
+    bool instanceTreeIsLoading(SVGElement*);
     virtual void notifyFinished(Resource*) OVERRIDE;
     TreeScope* referencedScope() const;
     void setDocumentResource(ResourcePtr<DocumentResource>);
@@ -111,7 +101,7 @@ private:
 
     bool m_haveFiredLoadEvent;
     bool m_needsShadowTreeRecreation;
-    RefPtrWillBeMember<SVGElementInstance> m_targetElementInstance;
+    RefPtrWillBeMember<SVGElement> m_targetElementInstance;
     ResourcePtr<DocumentResource> m_resource;
     Timer<SVGElement> m_svgLoadEventTimer;
 };