Merge 94905

Source/WebCore/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.
  *
  * 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 186 matching lines @@
         return;
 
     if (SVGURIReference::isKnownAttribute(attrName)) {
         if (hasPendingResources()) {
             OwnPtr<SVGDocumentExtensions::SVGPendingElements> clients(document()->accessSVGExtensions()->removePendingResource(m_resourceId));
             ASSERT(!clients->isEmpty());
 
             const SVGDocumentExtensions::SVGPendingElements::const_iterator end = clients->end();
             for (SVGDocumentExtensions::SVGPendingElements::const_iterator it = clients->begin(); it != end; ++it) {
                 ASSERT((*it)->hasPendingResources());
-                (*it)->setHasPendingResources(false);
+                (*it)->clearHasPendingResourcesIfPossible();
             }
 
             m_resourceId = String();
-            setHasPendingResources(false);
+            clearHasPendingResourcesIfPossible();
         }
 
         m_targetElementInstance = 0;
         invalidateShadowTree();
         return;
     }
 
     if (isXYAttribute) {
         updateContainerOffsets();
         return;
@@ skipping 870 matching lines @@
     SVGElement* element = m_targetElementInstance->correspondingElement();
     if (!element || !element->isStyled())
         return false;
 
     return static_cast<SVGStyledElement*>(element)->hasRelativeLengths();
 }
 
 }
 
 #endif // ENABLE(SVG)