Oilpan: move MHTML objects to the heap.

Source/platform/mhtml/ArchiveResourceCollection.cpp

 /*
  * Copyright (C) 2008 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 11 matching lines @@
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "platform/mhtml/ArchiveResourceCollection.h"
 
+#include "platform/mhtml/ArchiveResource.h"
+#include "platform/mhtml/MHTMLArchive.h"
 #include "platform/weborigin/KURL.h"
 
 namespace WebCore {
 
 ArchiveResourceCollection::ArchiveResourceCollection()
 {
 }
 
+ArchiveResourceCollection::~ArchiveResourceCollection()
+{
+}
+
 void ArchiveResourceCollection::addAllResources(MHTMLArchive* archive)
 {
     ASSERT(archive);
     if (!archive)
         return;
 
-    const Vector<RefPtr<ArchiveResource> >& subresources = archive->subresources();
-    for (Vector<RefPtr<ArchiveResource> >::const_iterator iterator = subresources.begin(); iterator != subresources.end(); ++iterator)
+    const MHTMLArchive::SubArchiveResources& subresources = archive->subresources();
+    for (MHTMLArchive::SubArchiveResources::const_iterator iterator = subresources.begin(); iterator != subresources.end(); ++iterator)
         m_subresources.set((*iterator)->url(), iterator->get());
 
-    const Vector<RefPtr<MHTMLArchive> >& subframes = archive->subframeArchives();
-    for (Vector<RefPtr<MHTMLArchive> >::const_iterator iterator = subframes.begin(); iterator != subframes.end(); ++iterator) {
-        RefPtr<MHTMLArchive> archive = *iterator;
+    const MHTMLArchive::SubFrameArchives& subframes = archive->subframeArchives();
+    for (MHTMLArchive::SubFrameArchives::const_iterator iterator = subframes.begin(); iterator != subframes.end(); ++iterator) {
+        RefPtrWillBeRawPtr<MHTMLArchive> archive = *iterator;
         ASSERT(archive->mainResource());
 
         const String& frameName = archive->mainResource()->frameName();
         if (!frameName.isNull()) {
             m_subframes.set(frameName, archive.get());
         } else {
             // In the MHTML case, frames don't have a name so we use the URL instead.
             m_subframes.set(archive->mainResource()->url().string(), archive.get());
         }
     }
 }
 
 // FIXME: Adding a resource directly to a DocumentLoader/ArchiveResourceCollection seems like bad design, but is API some apps rely on.
 // Can we change the design in a manner that will let us deprecate that API without reducing functionality of those apps?
-void ArchiveResourceCollection::addResource(PassRefPtr<ArchiveResource> resource)
+void ArchiveResourceCollection::addResource(PassRefPtrWillBeRawPtr<ArchiveResource> resource)
 {
     ASSERT(resource);
     if (!resource)
         return;
 
     const KURL& url = resource->url(); // get before passing PassRefPtr (which sets it to 0)
     m_subresources.set(url, resource);
 }
 
 ArchiveResource* ArchiveResourceCollection::archiveResourceForURL(const KURL& url)
 {
     ArchiveResource* resource = m_subresources.get(url);
     if (!resource)
         return 0;
 
     return resource;
 }
 
-PassRefPtr<MHTMLArchive> ArchiveResourceCollection::popSubframeArchive(const String& frameName, const KURL& url)
+PassRefPtrWillBeRawPtr<MHTMLArchive> ArchiveResourceCollection::popSubframeArchive(const String& frameName, const KURL& url)
 {
-    RefPtr<MHTMLArchive> archive = m_subframes.take(frameName);
+    RefPtrWillBeRawPtr<MHTMLArchive> archive = m_subframes.take(frameName);
     if (archive)
         return archive.release();
 
     return m_subframes.take(url.string());
 }
 
+void ArchiveResourceCollection::trace(Visitor* visitor)
+{
+    visitor->trace(m_subresources);
+    visitor->trace(m_subframes);
 }
+
+}