Straighten up HTML Imports load vs. share loader logic.

Source/core/html/imports/HTMLImportChild.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 23 matching lines @@
 #include "core/dom/Document.h"
 #include "core/dom/custom/CustomElement.h"
 #include "core/dom/custom/CustomElementMicrotaskDispatcher.h"
 #include "core/dom/custom/CustomElementMicrotaskImportStep.h"
 #include "core/html/imports/HTMLImportChildClient.h"
 #include "core/html/imports/HTMLImportLoader.h"
 #include "core/html/imports/HTMLImportsController.h"
 
 namespace WebCore {
 
-HTMLImportChild::HTMLImportChild(const KURL& url, SyncMode sync)
+HTMLImportChild::HTMLImportChild(const KURL& url, HTMLImportLoader* loader, SyncMode sync)
     : HTMLImport(sync)
     , m_url(url)
     , m_weakFactory(this)
-    , m_loader(0)
+    , m_loader(loader)
     , m_client(0)
 {
 }
 
 HTMLImportChild::~HTMLImportChild()
 {
     // importDestroyed() should be called before the destruction.
     ASSERT(!m_loader);
 
     if (m_client)
         m_client->importChildWasDestroyed(this);
 }
 
-void HTMLImportChild::wasAlreadyLoaded()
+void HTMLImportChild::didShareLoader()
 {
-    ASSERT(!m_loader);
-    ASSERT(m_client);
-    shareLoader();
+    createCustomElementMicrotaskStepIfNeeded();
     stateWillChange();
 }
 
-void HTMLImportChild::startLoading(const ResourcePtr<RawResource>& resource)
+void HTMLImportChild::didStartLoading()
 {
-    ASSERT(!m_loader);
-
-    if (m_loader)
-        return;
-
-    m_loader = toHTMLImportsController(root())->createLoader();
-    m_loader->addImport(this);
-    m_loader->startLoading(resource);
-
     createCustomElementMicrotaskStepIfNeeded();
 }
 
 void HTMLImportChild::didFinish()
 {
     if (m_client)
         m_client->didFinish();
 }
 
 void HTMLImportChild::didFinishLoading()
@@ skipping 69 matching lines @@
     }
 
     if (!isDone() && !formsCycle()) {
         m_customElementMicrotaskStep = CustomElement::didCreateImport(this)->weakPtr();
     }
 
     for (HTMLImport* child = firstChild(); child; child = child->next())
         toHTMLImportChild(child)->createCustomElementMicrotaskStepIfNeeded();
 }
 
-void HTMLImportChild::shareLoader()
-{
-    ASSERT(!m_loader);
-
-    if (HTMLImportChild* childToShareWith = toHTMLImportsController(root())->findLinkFor(m_url, this)) {
-        m_loader = childToShareWith->m_loader;
-        m_loader->addImport(this);
-    }
-
-    createCustomElementMicrotaskStepIfNeeded();
-}
-
 bool HTMLImportChild::isDone() const
 {
     return m_loader && m_loader->isDone() && !m_loader->microtaskQueue()->needsProcessOrStop() && !m_customElementMicrotaskStep;
 }
 
 bool HTMLImportChild::loaderHasError() const
 {
     return m_loader && m_loader->hasError();
 }
 
@@ skipping 42 matching lines @@
     fprintf(stderr, " loader=%p first=%d, step=%p sync=%s url=%s",
         m_loader,
         isFirst,
         m_customElementMicrotaskStep.get(),
         isSync() ? "Y" : "N",
         url().string().utf8().data());
 }
 #endif
 
 } // namespace WebCore