Refactoring: Get rid of HTMLImportLoaerClient

Source/core/html/imports/HTMLImportLoader.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 21 matching lines @@
 #define HTMLImportLoader_h
 
 #include "core/fetch/RawResource.h"
 #include "core/fetch/ResourceOwner.h"
 #include "wtf/Vector.h"
 
 namespace WebCore {
 
 class Document;
 class DocumentWriter;
-class HTMLImport;
-class HTMLImportLoaderClient;
+class HTMLImportChild;
 
 //
 // Owning imported Document lifetime. It also implements ResourceClient through ResourceOwner
 // to feed fetched bytes to the DocumentWriter of the imported document.
 // HTMLImportLoader is owned by and shared between HTMLImportChild.
 //
 //
 class HTMLImportLoader FINAL : public RefCounted<HTMLImportLoader>, public ResourceOwner<RawResource> {
 public:
     enum State {
         StateLoading,
         StateWritten,
         StateParsed,
         StateLoaded,
         StateError
     };
 
-    static PassRefPtr<HTMLImportLoader> create(HTMLImport* import)
+    static PassRefPtr<HTMLImportLoader> create()
     {
-        return adoptRef(new HTMLImportLoader(import));
+        return adoptRef(new HTMLImportLoader());
     }
 
     virtual ~HTMLImportLoader();
 
     Document* document() const { return m_importedDocument.get(); }
     Document* importedDocument() const;
-    void addClient(HTMLImportLoaderClient*);
-    void removeClient(HTMLImportLoaderClient*);
+    void addImport(HTMLImportChild*);
+    void removeImport(HTMLImportChild*);
 
     bool isDone() const { return m_state == StateLoaded || m_state == StateError; }
     bool hasError() const { return m_state == StateError; }
 
     void startLoading(const ResourcePtr<RawResource>&);
     void didFinishParsing();
     void didRemoveAllPendingStylesheet();
-    bool isOwnedBy(const HTMLImport* import) const { return m_import == import; }
+    bool isOwnedBy(const HTMLImportChild* import) const { return m_imports[0] == import; }
 
 private:
-    HTMLImportLoader(HTMLImport*);
+    HTMLImportLoader();
 
     // RawResourceClient
     virtual void responseReceived(Resource*, const ResourceResponse&) OVERRIDE;
     virtual void dataReceived(Resource*, const char* data, int length) OVERRIDE;
     virtual void notifyFinished(Resource*) OVERRIDE;
 
     State startWritingAndParsing(const ResourceResponse&);
     State finishWriting();
     State finishParsing();
     State finishLoading();
 
     void setState(State);
     void didFinishLoading();
     bool hasPendingResources() const;
 
-    HTMLImport* m_import;
-    Vector<HTMLImportLoaderClient*> m_clients;
+    Vector<HTMLImportChild*> m_imports;
     State m_state;
     RefPtr<Document> m_importedDocument;
     RefPtr<DocumentWriter> m_writer;
 };
 
 } // namespace WebCore
 
 #endif // HTMLImportLoader_h