Followup fixes for bug 332066.

Source/core/svg/SVGUseElement.cpp

 /*
  * Copyright (C) 2004, 2005, 2006, 2007, 2008 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007 Rob Buis <buis@kde.org>
  * Copyright (C) Research In Motion Limited 2009-2010. All rights reserved.
  * Copyright (C) 2011 Torch Mobile (Beijing) Co. Ltd. All rights reserved.
  * Copyright (C) 2012 University of Szeged
  * Copyright (C) 2012 Renata Hodovan <reni@webkit.org>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 149 matching lines @@
 {
     // This functions exists to assure assumptions made in the code regarding SVGElementInstance creation/destruction are satisfied.
     SVGGraphicsElement::insertedInto(rootParent);
     if (!rootParent->inDocument())
         return InsertionDone;
     ASSERT(!m_targetElementInstance || !isWellFormedDocument(&document()));
     ASSERT(!hasPendingResources() || !isWellFormedDocument(&document()));
     if (!m_wasInsertedByParser) {
         buildPendingResource();
 
-        m_haveFiredLoadEvent = true;
-        sendSVGLoadEventIfPossibleAsynchronously();
+        if (!isStructurallyExternal()) {
+            sendSVGLoadEventIfPossibleAsynchronously();
+        }
     }
-
     return InsertionDone;
 }
 
 void SVGUseElement::removedFrom(ContainerNode* rootParent)
 {
     SVGGraphicsElement::removedFrom(rootParent);
     if (rootParent->inDocument())
         clearResourceReferences();
 }
 
@@ skipping 743 matching lines @@
 
 void SVGUseElement::notifyFinished(Resource* resource)
 {
     if (!inDocument())
         return;
 
     invalidateShadowTree();
     if (resource->errorOccurred())
         dispatchEvent(Event::create(EventTypeNames::error));
     else if (!resource->wasCanceled()) {
-        if (!m_wasInsertedByParser)
-            ASSERT(m_haveFiredLoadEvent);
-        else if (m_haveFiredLoadEvent)
+        if (m_wasInsertedByParser && m_haveFiredLoadEvent)
             return;
+        if (!isStructurallyExternal())
+            return;
+
+        ASSERT(!m_haveFiredLoadEvent);
+        m_haveFiredLoadEvent = true;
+        sendSVGLoadEventIfPossible();
     }
 }
 
 bool SVGUseElement::resourceIsStillLoading()
 {
     if (m_resource && m_resource->isLoading())
         return true;
     return false;
 }
 
 bool SVGUseElement::instanceTreeIsLoading(SVGElementInstance* targetElementInstance)
 {
     for (SVGElementInstance* instance = targetElementInstance->firstChild(); instance; instance = instance->nextSibling()) {
         if (SVGUseElement* use = instance->correspondingUseElement()) {
             if (use->resourceIsStillLoading())
                 return true;
         }
         if (instance->hasChildNodes())
             instanceTreeIsLoading(instance);
     }
     return false;
 }
 
 void SVGUseElement::finishParsingChildren()
 {
     SVGGraphicsElement::finishParsingChildren();
-    m_haveFiredLoadEvent = true;
     if (m_wasInsertedByParser) {
         buildPendingResource();
         m_wasInsertedByParser = false;
     }
 }
 
 void SVGUseElement::setDocumentResource(ResourcePtr<DocumentResource> resource)
 {
     if (m_resource == resource)
         return;
 
     if (m_resource)
         m_resource->removeClient(this);
 
     m_resource = resource;
     if (m_resource)
         m_resource->addClient(this);
 }
 
 }