Stop using SVGElementInstance in SVGElement

Stop using SVGElementInstance in SVGElement since we want to remove it.

BUG=313438

Review URL: https://codereview.chromium.org/272623003

git-svn-id: svn://svn.chromium.org/blink/trunk@173637 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/Source/core/svg/SVGElement.cpp

@@ -42,7 +42,6 @@
 #include "core/rendering/svg/RenderSVGResourceContainer.h"
 #include "core/svg/SVGCursorElement.h"
 #include "core/svg/SVGDocumentExtensions.h"
-#include "core/svg/SVGElementInstance.h"
 #include "core/svg/SVGElementRareData.h"
 #include "core/svg/SVGGraphicsElement.h"
 #include "core/svg/SVGSVGElement.h"
@@ -528,28 +527,27 @@ SVGDocumentExtensions& SVGElement::accessDocumentSVGExtensions()
     return document().accessSVGExtensions();
 }
 
-void SVGElement::mapInstanceToElement(SVGElementInstance* instance)
+void SVGElement::mapInstanceToElement(SVGElement* instance)
 {
     ASSERT(instance);
+    ASSERT(instance->inUseShadowTree());
 
     HashSet<SVGElement*>& instances = ensureSVGRareData()->elementInstances();
-    ASSERT(!instances.contains(instance->shadowTreeElement()));
+    ASSERT(!instances.contains(instance));
 
-    instances.add(instance->shadowTreeElement());
+    instances.add(instance);
 }
 
-void SVGElement::removeInstanceMapping(SVGElementInstance* instance)
+void SVGElement::removeInstanceMapping(SVGElement* instance)
 {
     ASSERT(instance);
+    ASSERT(instance->inUseShadowTree());
     ASSERT(hasSVGRareData());
 
-    if (!instance->shadowTreeElement())
-        return;
-
     HashSet<SVGElement*>& instances = svgRareData()->elementInstances();
-    ASSERT(instances.contains(instance->shadowTreeElement()));
+    ASSERT(instances.contains(instance));
 
-    instances.remove(instance->shadowTreeElement());
+    instances.remove(instance);
 }
 
 const HashSet<SVGElement*>& SVGElement::instancesForElement() const

third_party/WebKit/Source/core/svg/SVGElement.h

@@ -40,7 +40,6 @@ class SVGAnimatedPropertyBase;
 class SubtreeLayoutScope;
 class SVGCursorElement;
 class SVGDocumentExtensions;
-class SVGElementInstance;
 class SVGElementRareData;
 class SVGFitToViewBox;
 class SVGSVGElement;
@@ -109,6 +108,8 @@ public:
     void invalidateSVGPresentationAttributeStyle() { ensureUniqueElementData().m_presentationAttributeStyleIsDirty = true; }
 
     const HashSet<SVGElement*>& instancesForElement() const;
+    void mapInstanceToElement(SVGElement*);
+    void removeInstanceMapping(SVGElement*);
 
     bool getBoundingBox(FloatRect&);
 
@@ -210,8 +211,6 @@ protected:
     bool hasFocusEventListeners() const;
 
 private:
-    friend class SVGElementInstance;
-
     // FIXME: Author shadows should be allowed
     // https://bugs.webkit.org/show_bug.cgi?id=77938
     virtual bool areAuthorShadowsAllowed() const OVERRIDE FINAL { return false; }
@@ -222,9 +221,6 @@ private:
 
     void buildPendingResourcesIfNeeded();
 
-    void mapInstanceToElement(SVGElementInstance*);
-    void removeInstanceMapping(SVGElementInstance*);
-
     bool supportsSpatialNavigationFocus() const;
 
     HashSet<SVGElement*> m_elementsWithRelativeLengths;

third_party/WebKit/Source/core/svg/SVGElementInstance.cpp

@@ -139,7 +139,7 @@ void SVGElementInstance::detach()
 
     // Deregister as instance for passed element, if we haven't already.
     if (shadowTreeElement() && m_element->instancesForElement().contains(shadowTreeElement()))
-        m_element->removeInstanceMapping(this);
+        m_element->removeInstanceMapping(shadowTreeElement());
     // DO NOT clear ref to m_element because JavaScriptCore uses it for garbage collection
 
     m_shadowTreeElement = nullptr;
@@ -157,7 +157,7 @@ void SVGElementInstance::setShadowTreeElement(SVGElement* element)
     ASSERT(element);
     m_shadowTreeElement = element;
     // Register as instance for passed element.
-    m_element->mapInstanceToElement(this);
+    m_element->mapInstanceToElement(shadowTreeElement());
 
 }
 

third_party/WebKit/Source/core/svg/SVGUseElement.cpp

@@ -324,15 +324,15 @@ void SVGUseElement::scheduleShadowTreeRecreation()
 
 void SVGUseElement::clearResourceReferences()
 {
-    // FIXME: We should try to optimize this, to at least allow partial reclones.
-    if (ShadowRoot* shadowTreeRootElement = userAgentShadowRoot())
-        shadowTreeRootElement->removeChildren();
-
     if (m_targetElementInstance) {
         m_targetElementInstance->detach();
         m_targetElementInstance = nullptr;
     }
 
+    // FIXME: We should try to optimize this, to at least allow partial reclones.
+    if (ShadowRoot* shadowTreeRootElement = userAgentShadowRoot())
+        shadowTreeRootElement->removeChildren();
+
     m_needsShadowTreeRecreation = false;
     document().unscheduleUseShadowTreeUpdate(*this);