Refactoring: Introduce HTMLImport interface to form import tree.

Source/core/html/HTMLImportsController.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 HTMLImportsController_h
 #define HTMLImportsController_h
 
+#include "core/html/HTMLImport.h"
 #include "core/html/LinkResource.h"
 #include "core/loader/cache/CachedRawResource.h"
 #include "core/loader/cache/CachedResourceHandle.h"
+#include "core/platform/Supplementable.h"
 #include "wtf/FastAllocBase.h"
 #include "wtf/PassOwnPtr.h"
 #include "wtf/Vector.h"
 
 namespace WebCore {
 
+class ScriptExecutionContext;
 class CachedResourceLoader;
 class HTMLImportLoader;
 class HTMLImportsController;
 class DocumentWriter;
 
 //
 // A LinkResource subclasss used for @rel=import.
 //
 class LinkImport : public LinkResource {
     WTF_MAKE_FAST_ALLOCATED;
 public:
 
     static PassRefPtr<LinkImport> create(HTMLLinkElement* owner);
 
     explicit LinkImport(HTMLLinkElement* owner);
     virtual ~LinkImport();
 
     // LinkResource
     virtual void process() OVERRIDE;
     virtual Type type() const OVERRIDE { return Import; }
     virtual void ownerRemoved() OVERRIDE;
 
     Document* importedDocument() const;
 
 private:
     RefPtr<HTMLImportLoader> m_loader;
 };
 
-
-class HTMLImportLoader : public RefCounted<HTMLImportLoader>, public CachedRawResourceClient {
+class HTMLImportLoader : public RefCounted<HTMLImportLoader>, public HTMLImport, public CachedRawResourceClient {
 public:
     enum State {
         StateLoading,
         StateError,
         StateReady
     };
 
-    static PassRefPtr<HTMLImportLoader> create(HTMLImportsController*, const KURL&, const CachedResourceHandle<CachedScript>&);
+    static PassRefPtr<HTMLImportLoader> create(HTMLImport*, const KURL&, const CachedResourceHandle<CachedScript>&);

[dominicc (has gone to gerrit), 2013/07/11 03:26:48]

I think this parameter needs a name. It is a bit mysterious. parent?

     virtual ~HTMLImportLoader();
 
     Document* importedDocument() const;
     const KURL& url() const { return m_url; }
 
     void importDestroyed();
     bool isDone() const { return m_state == StateReady || m_state == StateError; }
 
+    // HTMLImport
+    virtual HTMLImportsController* controller() OVERRIDE;
+    virtual HTMLImport* parent() OVERRIDE;
+    virtual Document* document() OVERRIDE;
+
 private:
-    HTMLImportLoader(HTMLImportsController*, const KURL&, const CachedResourceHandle<CachedScript>&);
+    HTMLImportLoader(HTMLImport*, const KURL&, const CachedResourceHandle<CachedScript>&);
 
     // CachedRawResourceClient
     virtual void responseReceived(CachedResource*, const ResourceResponse&) OVERRIDE;
     virtual void dataReceived(CachedResource*, const char* data, int length) OVERRIDE;
     virtual void notifyFinished(CachedResource*) OVERRIDE;
 
     State startParsing(const ResourceResponse&);
     State finish();
     void setState(State);
     void dispose();
 
-    HTMLImportsController* m_controller;
+    HTMLImport* m_parent;
     State m_state;
     KURL m_url;
     CachedResourceHandle<CachedRawResource> m_resource;
     RefPtr<Document> m_importedDocument;
     RefPtr<DocumentWriter> m_writer;
 };
 
-
-class HTMLImportsController : public RefCounted<HTMLImportsController> {
+class HTMLImportsController : public HTMLImport, public Supplement<ScriptExecutionContext> {
     WTF_MAKE_FAST_ALLOCATED;
 public:
-    static PassRefPtr<HTMLImportsController> create(Document*);
+    static void provideTo(Document*);
 
     explicit HTMLImportsController(Document*);
     virtual ~HTMLImportsController();
 
+    // HTMLImport
+    virtual HTMLImportsController* controller() OVERRIDE;
+    virtual HTMLImport* parent() OVERRIDE;
+    virtual Document* document() OVERRIDE;
+
     void addImport(PassRefPtr<HTMLImportLoader>);
     void showSecurityErrorMessage(const String&);
     PassRefPtr<HTMLImportLoader> findLinkFor(const KURL&) const;
     SecurityOrigin* securityOrigin() const;
     CachedResourceLoader* cachedResourceLoader() const;
-    bool haveLoaded() const;
-    void didLoad();
+    bool haveChildrenLoaded(HTMLImport* parent) const;
+    void didLoad(HTMLImportLoader*);
 
 private:
     Document* m_master;
 
     // List of import which has been loaded or being loaded.
     typedef Vector<RefPtr<HTMLImportLoader> > ImportList;
     ImportList m_imports;
 };
 
 } // namespace WebCore
 
 #endif // HTMLImportsController_h