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

WebCore/svg/SVGDocumentExtensions.h

 /*
  * Copyright (C) 2006 Apple Inc. All rights reserved.
  * Copyright (C) 2006, 2008 Nikolas Zimmermann <zimmermann@kde.org>
  *
  * 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,
@@ skipping 22 matching lines @@
 namespace WebCore {
 
 class Document;
 class RenderSVGResourceContainer;
 class SVGStyledElement;
 class SVGSMILElement;
 class SVGSVGElement;
 
 class SVGDocumentExtensions : public Noncopyable {
 public:
+    typedef HashSet<RefPtr<SVGStyledElement> > SVGPendingElements;
     SVGDocumentExtensions(Document*);
     ~SVGDocumentExtensions();
     
     void addTimeContainer(SVGSVGElement*);
     void removeTimeContainer(SVGSVGElement*);
 
     void addResource(const AtomicString& id, RenderSVGResourceContainer*);
     void removeResource(const AtomicString& id);
     RenderSVGResourceContainer* resourceById(const AtomicString& id) const;
 
     void startAnimations();
     void pauseAnimations();
     void unpauseAnimations();
     bool sampleAnimationAtTime(const String& elementId, SVGSMILElement*, double time);
 
     void reportWarning(const String&);
     void reportError(const String&);
 
     SVGResourcesCache* resourcesCache() const { return m_resourcesCache.get(); }
 
 private:
     Document* m_document; // weak reference
     HashSet<SVGSVGElement*> m_timeContainers; // For SVG 1.2 support this will need to be made more general.
     HashMap<AtomicString, RenderSVGResourceContainer*> m_resources;
-    HashMap<AtomicString, HashSet<SVGStyledElement*>*> m_pendingResources;
+    HashMap<AtomicString, SVGPendingElements*> m_pendingResources;
     OwnPtr<SVGResourcesCache> m_resourcesCache;
 
     SVGDocumentExtensions(const SVGDocumentExtensions&);
     SVGDocumentExtensions& operator=(const SVGDocumentExtensions&);
 
 public:
     // This HashMap contains a list of pending resources. Pending resources, are such
     // which are referenced by any object in the SVG document, but do NOT exist yet.
     // For instance, dynamically build gradients / patterns / clippers...
-    void addPendingResource(const AtomicString& id, SVGStyledElement*);
+    void addPendingResource(const AtomicString& id, PassRefPtr<SVGStyledElement>);
     bool isPendingResource(const AtomicString& id) const;
-    PassOwnPtr<HashSet<SVGStyledElement*> > removePendingResource(const AtomicString& id);
+    PassOwnPtr<SVGPendingElements> removePendingResource(const AtomicString& id);
 };
 
 }
 
 #endif
 #endif