Store SVGElement instead of SVGElementInstance for instancesForElement

Source/core/svg/SVGElementInstance.cpp

 /*
  * Copyright (C) 2007, 2008 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) Research In Motion Limited 2010. All rights reserved.
  * Copyright (C) 2011 Torch Mobile (Beijing) Co. Ltd. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
@@ skipping 81 matching lines @@
     , m_element(originalElement)
     , m_previousSibling(0)
     , m_nextSibling(0)
     , m_firstChild(0)
     , m_lastChild(0)
 {
     ASSERT(m_correspondingUseElement);
     ASSERT(m_element);
     ScriptWrappable::init(this);
 
-    // Register as instance for passed element.
-    m_element->mapInstanceToElement(this);
-
 #ifndef NDEBUG
     instanceCounter.increment();
 #endif
 }
 
 SVGElementInstance::~SVGElementInstance()
 {
     // Call detach because we may be deleted directly if we are a child of a detached instance.
     detach();
 
@@ skipping 18 matching lines @@
 
 void SVGElementInstance::detach()
 {
     // Clear all pointers. When the node is detached from the shadow DOM it should be removed but,
     // due to ref counting, it may not be. So clear everything to avoid dangling pointers.
 
     for (SVGElementInstance* node = firstChild(); node; node = node->nextSibling())
         node->detach();
 
     // Deregister as instance for passed element, if we haven't already.
-    if (m_element->instancesForElement().contains(this))
+    if (m_element->instancesForElement().contains(shadowTreeElement()))
         m_element->removeInstanceMapping(this);
     // DO NOT clear ref to m_element because JavaScriptCore uses it for garbage collection
 
     m_shadowTreeElement = nullptr;
 
     m_directUseElement = 0;
     m_correspondingUseElement = 0;
 
     removeDetachedChildrenInContainer<SVGElementInstance, SVGElementInstance>(*this);
 }
 
 void SVGElementInstance::setShadowTreeElement(SVGElement* element)
 {
     ASSERT(element);
     m_shadowTreeElement = element;
+    // Register as instance for passed element.
+    m_element->mapInstanceToElement(this);
+
 }
 
 void SVGElementInstance::appendChild(PassRefPtr<SVGElementInstance> child)
 {
     appendChildToContainer<SVGElementInstance, SVGElementInstance>(*child, *this);
 }
 
 void SVGElementInstance::invalidateAllInstancesOfElement(SVGElement* element)
 {
     if (!element || !element->inDocument())
         return;
 
     if (element->instanceUpdatesBlocked())
         return;
 
-    const HashSet<SVGElementInstance*>& set = element->instancesForElement();
+    const HashSet<SVGElement*>& set = element->instancesForElement();
     if (set.isEmpty())
         return;
 
     // Mark all use elements referencing 'element' for rebuilding
-    const HashSet<SVGElementInstance*>::const_iterator end = set.end();
-    for (HashSet<SVGElementInstance*>::const_iterator it = set.begin(); it != end; ++it) {
-        ASSERT((*it)->shadowTreeElement());
-        ASSERT((*it)->shadowTreeElement()->correspondingElement());
-        ASSERT((*it)->shadowTreeElement()->correspondingElement() == (*it)->correspondingElement());
-        ASSERT((*it)->correspondingElement() == element);
-        (*it)->shadowTreeElement()->setCorrespondingElement(0);
+    const HashSet<SVGElement*>::const_iterator end = set.end();
+    for (HashSet<SVGElement*>::const_iterator it = set.begin(); it != end; ++it) {
+        (*it)->setCorrespondingElement(0);
 
         if (SVGUseElement* element = (*it)->correspondingUseElement()) {
             ASSERT(element->inDocument());
             element->invalidateShadowTree();
         }
     }
 
     element->document().updateRenderTreeIfNeeded();
 }
 
@@ skipping 62 matching lines @@
         m_targetElement->setInstanceUpdatesBlocked(true);
 }
 
 SVGElementInstance::InstanceUpdateBlocker::~InstanceUpdateBlocker()
 {
     if (m_targetElement)
         m_targetElement->setInstanceUpdatesBlocked(false);
 }
 
 }