Merge 66847 - 2010-09-06 Justin Schuh <jschuh@chromium.org>...

WebCore/svg/SVGElement.cpp

 /*
  * Copyright (C) 2004, 2005, 2006, 2007, 2008 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2008 Rob Buis <buis@kde.org>
  * Copyright (C) 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Alp Toker <alp@atoker.com>
  * Copyright (C) 2009 Cameron McCormack <cam@mcc.id.au>
  *
  * 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
@@ skipping 269 matching lines @@
     StyledElement::insertedIntoDocument();
 
     if (!needsPendingResourceHandling())
         return;
 
     SVGDocumentExtensions* extensions = document()->accessSVGExtensions();
     String resourceId = getIdAttribute();
     if (!extensions->isPendingResource(resourceId))
         return;
     
-    OwnPtr<HashSet<SVGStyledElement*> > clients(extensions->removePendingResource(resourceId));
+    OwnPtr<SVGDocumentExtensions::SVGPendingElements> clients(extensions->removePendingResource(resourceId));
     if (clients->isEmpty())
         return;
 
-    const HashSet<SVGStyledElement*>::const_iterator end = clients->end();
-    for (HashSet<SVGStyledElement*>::const_iterator it = clients->begin(); it != end; ++it)
+    const SVGDocumentExtensions::SVGPendingElements::const_iterator end = clients->end();
+    for (SVGDocumentExtensions::SVGPendingElements::const_iterator it = clients->begin(); it != end; ++it)
         (*it)->buildPendingResource();
 }
 
 void SVGElement::attributeChanged(Attribute* attr, bool preserveDecls)
 {
     ASSERT(attr);
     if (!attr)
         return;
 
     StyledElement::attributeChanged(attr, preserveDecls);
@@ skipping 29 matching lines @@
 ContainerNode* SVGElement::eventParentNode()
 {
     if (ContainerNode* shadowParent = shadowParentNode())
         return shadowParent;
     return StyledElement::eventParentNode();
 }
 
 }
 
 #endif // ENABLE(SVG)