Make HTMLImportTreeNode own the whole import tree.

Source/core/html/imports/HTMLImportsController.cpp

 /*
  * Copyright (C) 2013 Google 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 44 matching lines @@
 {
 }
 
 HTMLImportsController::~HTMLImportsController()
 {
     ASSERT(!m_master);
 }
 
 void HTMLImportsController::clear()
 {
-    for (size_t i = 0; i < m_imports.size(); ++i)
-        m_imports[i]->importDestroyed();
-    m_imports.clear();
+    m_root.clear();
 
     for (size_t i = 0; i < m_loaders.size(); ++i)
         m_loaders[i]->importDestroyed();
     m_loaders.clear();
 
     if (m_master)
         m_master->setImportsController(0);
     m_master = 0;
 
     m_root.clear();
 }
 
 static bool makesCycle(HTMLImport* parent, const KURL& url)
 {
     for (HTMLImport* ancestor = parent; ancestor; ancestor = ancestor->parent()) {
         if (!ancestor->isRoot() && equalIgnoringFragmentIdentifier(toHTMLImportChild(parent)->url(), url))
             return true;
     }
 
     return false;
 }
 
 HTMLImportChild* HTMLImportsController::createChild(const KURL& url, HTMLImportLoader* loader, HTMLImport* parent, HTMLImportChildClient* client)
 {
     HTMLImport::SyncMode mode = client->isSync() && !makesCycle(parent, url) ? HTMLImport::Sync : HTMLImport::Async;
     OwnPtr<HTMLImportChild> child = adoptPtr(new HTMLImportChild(url, loader, mode));
     child->setClient(client);
     parent->appendImport(child.get());
     loader->addImport(child.get());
-    m_imports.append(child.release());
-    return m_imports.last().get();
+    return root()->add(child.release());
 }
 
 HTMLImportChild* HTMLImportsController::load(HTMLImport* parent, HTMLImportChildClient* client, FetchRequest request)
 {
     ASSERT(!request.url().isEmpty() && request.url().isValid());
     ASSERT(parent == root() || toHTMLImportChild(parent)->loader()->isFirstImport(toHTMLImportChild(parent)));
 
-    if (HTMLImportChild* childToShareWith = findLinkFor(request.url())) {
+    if (HTMLImportChild* childToShareWith = root()->find(request.url())) {
         HTMLImportLoader* loader = childToShareWith->loader();
         ASSERT(loader);
         HTMLImportChild* child = createChild(request.url(), loader, parent, client);
         child->didShareLoader();
         return child;
     }
 
     bool sameOriginRequest = securityOrigin()->canRequest(request.url());
     request.setCrossOriginAccessControl(
         securityOrigin(), sameOriginRequest ? AllowStoredCredentials : DoNotAllowStoredCredentials,
@@ skipping 10 matching lines @@
     child->didStartLoading();
 
     return child;
 }
 
 void HTMLImportsController::showSecurityErrorMessage(const String& message)
 {
     m_master->addConsoleMessage(JSMessageSource, ErrorMessageLevel, message);
 }
 
-HTMLImportChild* HTMLImportsController::findLinkFor(const KURL& url) const
-{
-    for (size_t i = 0; i < m_imports.size(); ++i) {
-        HTMLImportChild* candidate = m_imports[i].get();
-        if (equalIgnoringFragmentIdentifier(candidate->url(), url) && candidate->loader())
-            return candidate;
-    }
-
-    return 0;
-}
-
 SecurityOrigin* HTMLImportsController::securityOrigin() const
 {
     return m_master->securityOrigin();
 }
 
 ResourceFetcher* HTMLImportsController::fetcher() const
 {
     return m_master->fetcher();
 }
 
@@ skipping 27 matching lines @@
 {
     for (size_t i = 0; i < m_loaders.size(); ++i) {
         if (m_loaders[i]->document() == &document)
             return m_loaders[i].get();
     }
 
     return 0;
 }
 
 } // namespace WebCore