Straighten up HTML Imports load vs. share loader logic.

Source/core/html/imports/HTMLImportChild.h

 /*
  * 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 13 matching lines @@
  * 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.
  */
 
 #ifndef HTMLImportChild_h
 #define HTMLImportChild_h
 
-#include "core/fetch/RawResource.h"
 #include "core/html/imports/HTMLImport.h"
 #include "platform/heap/Handle.h"
 #include "platform/weborigin/KURL.h"
 #include "wtf/Vector.h"
 #include "wtf/WeakPtr.h"
 
 namespace WebCore {
 
 class CustomElementMicrotaskImportStep;
 class HTMLImportLoader;
 class HTMLImportChildClient;
 class HTMLLinkElement;
 
 //
 // An import tree node subclas to encapsulate imported document
 // lifecycle. This class is owned by HTMLImportsController. The actual loading
 // is done by HTMLImportLoader, which can be shared among multiple
 // HTMLImportChild of same link URL.
 //
 class HTMLImportChild FINAL : public HTMLImport {
 public:
-    HTMLImportChild(const KURL&, SyncMode);
+    HTMLImportChild(const KURL&, HTMLImportLoader*, SyncMode);
     virtual ~HTMLImportChild();
 
     HTMLLinkElement* link() const;
     Document* importedDocument() const;
     const KURL& url() const { return m_url; }
 
-    void wasAlreadyLoaded();
-    void startLoading(const ResourcePtr<RawResource>&);
+    void didShareLoader();
+    void didStartLoading();
     void importDestroyed();
     WeakPtr<HTMLImportChild> weakPtr() { return m_weakFactory.createWeakPtr(); }
 
     // HTMLImport
     virtual bool isChild() const OVERRIDE { return true; }
     virtual Document* document() const OVERRIDE;
     virtual bool isDone() const OVERRIDE;
     virtual HTMLImportLoader* loader() const OVERRIDE { return m_loader; }
     virtual void stateWillChange() OVERRIDE;
     virtual void stateDidChange() OVERRIDE;
@@ skipping 26 matching lines @@
 
 inline HTMLImportChild* toHTMLImportChild(HTMLImport* import)
 {
     ASSERT(!import || import->isChild());
     return static_cast<HTMLImportChild*>(import);
 }
 
 } // namespace WebCore
 
 #endif // HTMLImportChild_h