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

WebCore/rendering/RenderSVGResourceContainer.cpp

 /*
  * Copyright (C) Research In Motion Limited 2010. 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.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 142 matching lines @@
 }
 
 void RenderSVGResourceContainer::registerResource()
 {
     SVGDocumentExtensions* extensions = svgExtensionsFromNode(node());
     if (!extensions->isPendingResource(m_id)) {
         extensions->addResource(m_id, this);
         return;
     }
 
-    OwnPtr<HashSet<SVGStyledElement*> > clients(extensions->removePendingResource(m_id));
+    OwnPtr<SVGDocumentExtensions::SVGPendingElements> clients(extensions->removePendingResource(m_id));
 
     // Cache us with the new id.
     extensions->addResource(m_id, this);
 
     // Update cached resources of pending clients.
-    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) {
         RenderObject* renderer = (*it)->renderer();
         if (!renderer)
             continue;
         SVGResourcesCache::clientUpdatedFromElement(renderer, renderer->style());
         renderer->setNeedsLayout(true);
     }
 }
 
 // FIXME: This does not belong here.
 AffineTransform RenderSVGResourceContainer::transformOnNonScalingStroke(RenderObject* object, const AffineTransform& resourceTransform)
 {
     if (!object->isRenderPath())
         return resourceTransform;
 
     SVGStyledTransformableElement* element = static_cast<SVGStyledTransformableElement*>(object->node());
     AffineTransform transform = resourceTransform;
     transform.multiply(element->getScreenCTM(SVGLocatable::DisallowStyleUpdate));
     return transform;
 }
 
 }
 
 #endif