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

WebCore/svg/SVGDocumentExtensions.cpp

 /*
  * Copyright (C) 2006 Apple Inc. All rights reserved.
  * Copyright (C) 2006 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2007 Rob Buis <buis@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.
  *
@@ skipping 138 matching lines @@
 void SVGDocumentExtensions::reportWarning(const String& message)
 {
     reportMessage(m_document, WarningMessageLevel, "Warning: " + message);
 }
 
 void SVGDocumentExtensions::reportError(const String& message)
 {
     reportMessage(m_document, ErrorMessageLevel, "Error: " + message);
 }
 
-void SVGDocumentExtensions::addPendingResource(const AtomicString& id, SVGStyledElement* obj)
+void SVGDocumentExtensions::addPendingResource(const AtomicString& id, PassRefPtr<SVGStyledElement> obj)
 {
     ASSERT(obj);
 
     if (id.isEmpty())
         return;
 
     if (m_pendingResources.contains(id))
         m_pendingResources.get(id)->add(obj);
     else {
-        HashSet<SVGStyledElement*>* set = new HashSet<SVGStyledElement*>;
+        SVGPendingElements* set = new SVGPendingElements;
         set->add(obj);
 
         m_pendingResources.add(id, set);
     }
 }
 
 bool SVGDocumentExtensions::isPendingResource(const AtomicString& id) const
 {
     if (id.isEmpty())
         return false;
 
     return m_pendingResources.contains(id);
 }
 
-PassOwnPtr<HashSet<SVGStyledElement*> > SVGDocumentExtensions::removePendingResource(const AtomicString& id)
+PassOwnPtr<HashSet<RefPtr<SVGStyledElement> > > SVGDocumentExtensions::removePendingResource(const AtomicString& id)
 {
     ASSERT(m_pendingResources.contains(id));
 
-    OwnPtr<HashSet<SVGStyledElement*> > set(m_pendingResources.get(id));
+    OwnPtr<SVGPendingElements> set(m_pendingResources.get(id));
     m_pendingResources.remove(id);
     return set.release();
 }
 
 }
 
 #endif