Stop using SVGElementInstance in SVGElement

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 24 matching lines @@
 #include "core/dom/Document.h"
 #include "core/dom/ElementTraversal.h"
 #include "core/dom/shadow/ShadowRoot.h"
 #include "core/events/Event.h"
 #include "core/frame/Settings.h"
 #include "core/html/HTMLElement.h"
 #include "core/rendering/RenderObject.h"
 #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"
 #include "core/svg/SVGTitleElement.h"
 #include "core/svg/SVGUseElement.h"
 
 #include "wtf/TemporaryChange.h"
 
 namespace WebCore {
 
@@ skipping 465 matching lines @@
     return 0;
 }
 
 SVGDocumentExtensions& SVGElement::accessDocumentSVGExtensions()
 {
     // This function is provided for use by SVGAnimatedProperty to avoid
     // global inclusion of core/dom/Document.h in SVG code.
     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));
 
-    HashSet<SVGElement*>& instances = svgRareData()->elementInstances();
-    ASSERT(instances.contains(instance->shadowTreeElement()));
-
-    instances.remove(instance->shadowTreeElement());
+    instances.remove(instance);
 }
 
 const HashSet<SVGElement*>& SVGElement::instancesForElement() const
 {
     if (!hasSVGRareData()) {
         DEFINE_STATIC_LOCAL(HashSet<SVGElement*>, emptyInstances, ());
         return emptyInstances;
     }
     return svgRareData()->elementInstances();
 }
@@ skipping 609 matching lines @@
         animatableAttributes.add(SVGNames::zAttr);
     }
 
     if (name == classAttr)
         return true;
 
     return animatableAttributes.contains(name);
 }
 #endif
 }