Merge 91005

Source/WebCore/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 52 matching lines @@
 
 SVGElementInstance::~SVGElementInstance()
 {
 #ifndef NDEBUG
     instanceCounter.decrement();
 #endif
 
     // Deregister as instance for passed element.
     m_element->removeInstanceMapping(this);
 
+    clearChildren();
+}
+
+void SVGElementInstance::clearChildren()
+{
     removeAllChildrenInContainer<SVGElementInstance, SVGElementInstance>(this);
 }
 
 PassRefPtr<SVGElementInstanceList> SVGElementInstance::childNodes()
 {
     return SVGElementInstanceList::create(this);
 }
 
 void SVGElementInstance::setShadowTreeElement(SVGElement* element)
 {
@@ skipping 15 matching lines @@
         return;
 
     const HashSet<SVGElementInstance*>& 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)->correspondingElement() == element);
-        if (SVGUseElement* element = (*it)->correspondingUseElement())
+        if (SVGUseElement* element = (*it)->correspondingUseElement()) {
+            ASSERT(element->inDocument());
             element->invalidateShadowTree();
+        }
     }
 
     // Be sure to rebuild use trees, if needed
     element->document()->updateLayoutIgnorePendingStylesheets();
 }
 
 ScriptExecutionContext* SVGElementInstance::scriptExecutionContext() const
 {
     return m_element->document();
 }
@@ skipping 34 matching lines @@
 {
     // EventTarget would use these methods if we were actually using its add/removeEventListener logic.
     // As we're forwarding those calls to the correspondingElement(), no one should ever call this function.
     ASSERT_NOT_REACHED();
     return 0;
 }
 
 }
 
 #endif