Straighten up HTML Imports load vs. share loader logic.

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 71 matching lines @@
 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, HTMLImport* parent, HTMLImportChildClient* client)
+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> loader = adoptPtr(new HTMLImportChild(url, mode));
-    loader->setClient(client);
-    parent->appendImport(loader.get());
-    m_imports.append(loader.release());
+    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();
 }
 
 HTMLImportChild* HTMLImportsController::load(HTMLImport* parent, HTMLImportChildClient* client, FetchRequest request)
 {
     ASSERT(!request.url().isEmpty() && request.url().isValid());
     ASSERT(parent == this || toHTMLImportChild(parent)->loader()->isFirstImport(toHTMLImportChild(parent)));
 
-    if (findLinkFor(request.url())) {
-        HTMLImportChild* child = createChild(request.url(), parent, client);
-        child->wasAlreadyLoaded();
+    if (HTMLImportChild* childToShareWith = findLinkFor(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,
         ClientDidNotRequestCredentials);
     ResourcePtr<RawResource> resource = parent->document()->fetcher()->fetchImport(request);
     if (!resource)
         return 0;
 
-    HTMLImportChild* child = createChild(request.url(), parent, client);
+    HTMLImportLoader* loader = createLoader();
+    HTMLImportChild* child = createChild(request.url(), loader, parent, client);
     // We set resource after the import tree is built since
     // Resource::addClient() immediately calls back to feed the bytes when the resource is cached.
-    child->startLoading(resource);
+    loader->startLoading(resource);
+    child->didStartLoading();
 
     return child;
 }
 
 void HTMLImportsController::showSecurityErrorMessage(const String& message)
 {
     m_master->addConsoleMessage(JSMessageSource, ErrorMessageLevel, message);
 }
 
-HTMLImportChild* HTMLImportsController::findLinkFor(const KURL& url, HTMLImport* excluding) const
+HTMLImportChild* HTMLImportsController::findLinkFor(const KURL& url) const
 {
     for (size_t i = 0; i < m_imports.size(); ++i) {
         HTMLImportChild* candidate = m_imports[i].get();
-        if (candidate != excluding && equalIgnoringFragmentIdentifier(candidate->url(), url) && candidate->loader())
+        if (equalIgnoringFragmentIdentifier(candidate->url(), url) && candidate->loader())
             return candidate;
     }
 
     return 0;
 }
 
 SecurityOrigin* HTMLImportsController::securityOrigin() const
 {
     return m_master->securityOrigin();
 }
@@ skipping 75 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