Merge 111556

Source/WebCore/svg/SVGTRefElement.cpp

 /*
  * Copyright (C) 2004, 2005 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2004, 2005, 2006 Rob Buis <buis@kde.org>
  * Copyright (C) Research In Motion Limited 2011. 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 209 matching lines @@
         return StyledElement::rendererIsNeeded(context);
 
     return false;
 }
 
 void SVGTRefElement::buildPendingResource()
 {
     // Remove any existing event listener.
     clearEventListener();
 
+    // If we're not yet in a document, this function will be called again from insertedIntoDocument().
+    if (!inDocument())
+        return;
+
     String id;
     Element* target = SVGURIReference::targetElementFromIRIString(href(), document(), &id);
     if (!target) {
         if (hasPendingResources() || id.isEmpty())
             return;
 
         ASSERT(!hasPendingResources());
         document()->accessSVGExtensions()->addPendingResource(id, this);
         ASSERT(hasPendingResources());
         return;
     }
 
     updateReferencedText();
 
-    // We should not add the event listener if we are not in document yet.
-    if (!inDocument())
-        return;
-
     m_eventListener = SubtreeModificationEventListener::create(this, id);
     ASSERT(target->parentNode());
     target->parentNode()->addEventListener(eventNames().DOMSubtreeModifiedEvent, m_eventListener.get(), false);
 }
 
 void SVGTRefElement::insertedIntoDocument()
 {
     SVGStyledElement::insertedIntoDocument();
     buildPendingResource();
 }
 
 void SVGTRefElement::removedFromDocument()
 {
     SVGStyledElement::removedFromDocument();
     clearEventListener();
 }
 
 void SVGTRefElement::clearEventListener()
 {
     if (m_eventListener) {
         m_eventListener->clear();
         m_eventListener = 0;
     }
 }
 
 }
 
 #endif // ENABLE(SVG)