Remove SVGElementInstance

Source/core/svg/SVGElement.cpp

 /*
  * Copyright (C) 2004, 2005, 2006, 2007, 2008 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2008 Rob Buis <buis@kde.org>
  * Copyright (C) 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Alp Toker <alp@atoker.com>
  * Copyright (C) 2009 Cameron McCormack <cam@mcc.id.au>
  *
  * 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
@@ skipping 70 matching lines @@
 {
     ScriptWrappable::init(this);
     addToPropertyMap(m_className);
     setHasCustomStyleCallbacks();
 }
 
 SVGElement::~SVGElement()
 {
     ASSERT(inDocument() || !hasRelativeLengths());
 
+    if (correspondingElement() && correspondingElement()->instancesForElement().contains(this))
+        correspondingElement()->removeInstanceMapping(this);
     // The below teardown is all handled by weak pointer processing in oilpan.
 #if !ENABLE(OILPAN)
     if (hasSVGRareData()) {
         if (SVGCursorElement* cursorElement = svgRareData()->cursorElement())
             cursorElement->removeReferencedElement(this);
         if (CSSCursorImageValue* cursorImageValue = svgRareData()->cursorImageValue())
             cursorImageValue->removeReferencedElement(this);
         // Clear the rare data now so that we are in a consistent state when
         // calling rebuildAllElementReferencesForTarget() below.
         m_SVGRareData.clear();
@@ skipping 415 matching lines @@
 
     WillBeHeapHashSet<RawPtrWillBeWeakMember<SVGElement> >& instances = ensureSVGRareData()->elementInstances();
     ASSERT(!instances.contains(instance));
 
     instances.add(instance);
 }
 
 void SVGElement::removeInstanceMapping(SVGElement* instance)
 {
     ASSERT(instance);
-    ASSERT(instance->inUseShadowTree());
+    // ASSERT(instance->inUseShadowTree());

[eseidel, 2014/06/03 18:20:25]

Why commit commented out code?

 
     WillBeHeapHashSet<RawPtrWillBeWeakMember<SVGElement> >& instances = svgRareData()->elementInstances();
     ASSERT(instances.contains(instance));
 
     instances.remove(instance);
 }
 
 static WillBeHeapHashSet<RawPtrWillBeWeakMember<SVGElement> >& emptyInstances()
 {
 #if ENABLE(OILPAN)
@@ skipping 54 matching lines @@
 
 #if !ENABLE(OILPAN)
 void SVGElement::cursorImageValueRemoved()
 {
     svgRareData()->setCursorImageValue(0);
 }
 #endif
 
 SVGElement* SVGElement::correspondingElement()
 {
-    ASSERT(!hasSVGRareData() || !svgRareData()->correspondingElement() || containingShadowRoot());
+//    ASSERT(!hasSVGRareData() || !svgRareData()->correspondingElement() || containingShadowRoot());
     return hasSVGRareData() ? svgRareData()->correspondingElement() : 0;
 }
 
 SVGUseElement* SVGElement::correspondingUseElement() const
 {
     if (ShadowRoot* root = containingShadowRoot()) {
         if (isSVGUseElement(root->host()) && (root->type() == ShadowRoot::UserAgentShadowRoot))
             return toSVGUseElement(root->host());
     }
     return 0;
@@ skipping 423 matching lines @@
     const WillBeHeapHashSet<RawPtrWillBeWeakMember<SVGElement> >::const_iterator end = set.end();
     for (WillBeHeapHashSet<RawPtrWillBeWeakMember<SVGElement> >::const_iterator it = set.begin(); it != end; ++it) {
         (*it)->setCorrespondingElement(0);
 
         if (SVGUseElement* element = (*it)->correspondingUseElement()) {
             ASSERT(element->inDocument());
             element->invalidateShadowTree();
         }
     }
 
+    svgRareData()->elementInstances().clear();
+
     document().updateRenderTreeIfNeeded();
 }
 
 SVGElement::InstanceUpdateBlocker::InstanceUpdateBlocker(SVGElement* targetElement)
     : m_targetElement(targetElement)
 {
     if (m_targetElement)
         m_targetElement->setInstanceUpdatesBlocked(true);
 }
 
@@ skipping 111 matching lines @@
 #endif
 
 void SVGElement::trace(Visitor* visitor)
 {
     visitor->trace(m_elementsWithRelativeLengths);
     visitor->trace(m_SVGRareData);
     Element::trace(visitor);
 }
 
 }