Merge 126205

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 51 matching lines @@
     {
         return adoptRef(new SVGTRefTargetEventListener(trefElement));
     }
 
     static const SVGTRefTargetEventListener* cast(const EventListener* listener)
     {
         return listener->type() == SVGTRefTargetEventListenerType
                 ? static_cast<const SVGTRefTargetEventListener*>(listener) : 0;
     }
 
-    void attach(Element* target, String& targetId);
+    void attach(PassRefPtr<Element> target);
     void detach();
-    bool isAttached() const { return m_attached; }
+    bool isAttached() const { return m_target.get(); }
 
 private:
     SVGTRefTargetEventListener(SVGTRefElement* trefElement);
 
     virtual void handleEvent(ScriptExecutionContext*, Event*) OVERRIDE;
     virtual bool operator==(const EventListener&) OVERRIDE;
 
     SVGTRefElement* m_trefElement;
-    String m_targetId;
-    bool m_attached;
+    RefPtr<Element> m_target;
 };
 
 SVGTRefTargetEventListener::SVGTRefTargetEventListener(SVGTRefElement* trefElement)
     : EventListener(SVGTRefTargetEventListenerType)
     , m_trefElement(trefElement)
-    , m_attached(false)
+    , m_target(0)
 {
     ASSERT(m_trefElement);
 }
 
-void SVGTRefTargetEventListener::attach(Element* target, String& targetId)
+void SVGTRefTargetEventListener::attach(PassRefPtr<Element> target)
 {
     ASSERT(!isAttached());
-    ASSERT(target);
+    ASSERT(target.get());
     ASSERT(target->inDocument());
-    ASSERT(!targetId.isEmpty());
 
     target->addEventListener(eventNames().DOMSubtreeModifiedEvent, this, false);
     target->addEventListener(eventNames().DOMNodeRemovedFromDocumentEvent, this, false);
-    m_targetId = targetId;
-    m_attached = true;
+    m_target = target;
 }
 
 void SVGTRefTargetEventListener::detach()
 {
     if (!isAttached())
         return;
 
-    if (Element* target = m_trefElement->treeScope()->getElementById(m_targetId)) {
-        target->removeEventListener(eventNames().DOMSubtreeModifiedEvent, this, false);
-        target->removeEventListener(eventNames().DOMNodeRemovedFromDocumentEvent, this, false);
-    }
-
-    m_targetId = emptyString();
-    m_attached = false;
+    m_target->removeEventListener(eventNames().DOMSubtreeModifiedEvent, this, false);
+    m_target->removeEventListener(eventNames().DOMNodeRemovedFromDocumentEvent, this, false);
+    m_target.clear();
 }
 
 bool SVGTRefTargetEventListener::operator==(const EventListener& listener)
 {
     if (const SVGTRefTargetEventListener* targetListener = SVGTRefTargetEventListener::cast(&listener))
         return m_trefElement == targetListener->m_trefElement;
     return false;
 }
 
 void SVGTRefTargetEventListener::handleEvent(ScriptExecutionContext*, Event* event)
 {
     ASSERT(isAttached());
 
     if (event->type() == eventNames().DOMSubtreeModifiedEvent && m_trefElement != event->target())
-        m_trefElement->updateReferencedText();
+        m_trefElement->updateReferencedText(m_target.get());
     else if (event->type() == eventNames().DOMNodeRemovedFromDocumentEvent)
         m_trefElement->detachTarget();
 }
 
 class SVGShadowText : public Text {
 public:
     static PassRefPtr<SVGShadowText> create(Document* document, const String& data)
     {
         return adoptRef(new SVGShadowText(document, data));
     }
@@ skipping 31 matching lines @@
 SVGTRefElement::~SVGTRefElement()
 {
     m_targetListener->detach();
 }
 
 void SVGTRefElement::createShadowSubtree()
 {
     ShadowRoot::create(this, ShadowRoot::UserAgentShadowRoot, ASSERT_NO_EXCEPTION);
 }
 
-void SVGTRefElement::updateReferencedText()
+void SVGTRefElement::updateReferencedText(Element* target)
 {
     String textContent;
-    if (Element* target = SVGURIReference::targetElementFromIRIString(href(), document()))
+    if (target)
         textContent = target->textContent();
 
     ASSERT(shadow());
     ShadowRoot* root = shadow()->oldestShadowRoot();
     if (!root->firstChild())
         root->appendChild(SVGShadowText::create(document(), textContent), ASSERT_NO_EXCEPTION);
     else
         root->firstChild()->setTextContent(textContent, ASSERT_NO_EXCEPTION);
 }
 
@@ skipping 89 matching lines @@
 void SVGTRefElement::buildPendingResource()
 {
     // Remove any existing event listener.
     m_targetListener->detach();
 
     // If we're not yet in a document, this function will be called again from insertedInto().
     if (!inDocument())
         return;
 
     String id;
-    Element* target = SVGURIReference::targetElementFromIRIString(href(), document(), &id);
-    if (!target) {
+    RefPtr<Element> target = SVGURIReference::targetElementFromIRIString(href(), document(), &id);
+    if (!target.get()) {
         if (id.isEmpty())
             return;
 
         document()->accessSVGExtensions()->addPendingResource(id, this);
         ASSERT(hasPendingResources());
         return;
     }
 
     // Don't set up event listeners if this is a shadow tree node.
     // SVGUseElement::transferEventListenersToShadowTree() handles this task, and addEventListener()
     // expects every element instance to have an associated shadow tree element - which is not the
     // case when we land here from SVGUseElement::buildShadowTree().
     if (!isInShadowTree())
-        m_targetListener->attach(target, id);
+        m_targetListener->attach(target);
 
-    updateReferencedText();
+    updateReferencedText(target.get());
 }
 
 Node::InsertionNotificationRequest SVGTRefElement::insertedInto(ContainerNode* rootParent)
 {
     SVGStyledElement::insertedInto(rootParent);
     if (rootParent->inDocument())
         buildPendingResource();
     return InsertionDone;
 }
 
 void SVGTRefElement::removedFrom(ContainerNode* rootParent)
 {
     SVGStyledElement::removedFrom(rootParent);
     if (rootParent->inDocument())
         m_targetListener->detach();
 }
 
 }
 
 #endif // ENABLE(SVG)