Refactoring: Get rid of HTMLImportLoaerClient

Source/core/html/imports/HTMLImportLoader.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 17 matching lines @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "core/html/imports/HTMLImportLoader.h"
 
 #include "core/dom/Document.h"
 #include "core/dom/StyleEngine.h"
 #include "core/html/HTMLDocument.h"
 #include "core/html/imports/HTMLImport.h"
-#include "core/html/imports/HTMLImportLoaderClient.h"
+#include "core/html/imports/HTMLImportChild.h"
 #include "core/loader/DocumentWriter.h"
 #include "platform/network/ContentSecurityPolicyResponseHeaders.h"
 
 
 namespace WebCore {
 
-HTMLImportLoader::HTMLImportLoader(HTMLImport* import)
-    : m_import(import)
-    , m_state(StateLoading)
+HTMLImportLoader::HTMLImportLoader()
+    : m_state(StateLoading)
 {
 }
 
 HTMLImportLoader::~HTMLImportLoader()
 {
     if (m_importedDocument)
         m_importedDocument->setImport(0);
 }
 
 void HTMLImportLoader::startLoading(const ResourcePtr<RawResource>& resource)
@@ skipping 25 matching lines @@
     if (resource->loadFailedOrCanceled() && !m_writer) {
         setState(StateError);
         return;
     }
 
     setState(finishWriting());
 }
 
 HTMLImportLoader::State HTMLImportLoader::startWritingAndParsing(const ResourceResponse& response)
 {
-    DocumentInit init = DocumentInit(response.url(), 0, m_import->master()->contextDocument(), m_import)
-        .withRegistrationContext(m_import->master()->registrationContext());
+    ASSERT(!m_imports.isEmpty());
+    HTMLImport* firstImport = m_imports[0];
+    DocumentInit init = DocumentInit(response.url(), 0, firstImport->master()->contextDocument(), firstImport)
+        .withRegistrationContext(firstImport->master()->registrationContext());
     m_importedDocument = HTMLDocument::create(init);
     m_writer = DocumentWriter::create(m_importedDocument.get(), response.mimeType(), response.textEncodingName());
 
     return StateLoading;
 }
 
 HTMLImportLoader::State HTMLImportLoader::finishWriting()
 {
     return StateWritten;
 }
@@ skipping 45 matching lines @@
 
 Document* HTMLImportLoader::importedDocument() const
 {
     if (m_state == StateError)
         return 0;
     return m_importedDocument.get();
 }
 
 void HTMLImportLoader::didFinishLoading()
 {
-    for (size_t i = 0; i < m_clients.size(); ++i)
-        m_clients[i]->didFinishLoading();
+    for (size_t i = 0; i < m_imports.size(); ++i)
+        m_imports[i]->didFinishLoading();
 
     clearResource();
 
     ASSERT(!m_importedDocument || !m_importedDocument->parsing());
 }
 
-void HTMLImportLoader::addClient(HTMLImportLoaderClient* client)
+void HTMLImportLoader::addImport(HTMLImportChild* client)
 {
-    ASSERT(kNotFound == m_clients.find(client));
-    m_clients.append(client);
+    ASSERT(kNotFound == m_imports.find(client));
+    m_imports.append(client);
     if (isDone())
         client->didFinishLoading();
 }
 
-void HTMLImportLoader::removeClient(HTMLImportLoaderClient* client)
+void HTMLImportLoader::removeImport(HTMLImportChild* client)
 {
-    ASSERT(kNotFound != m_clients.find(client));
-    m_clients.remove(m_clients.find(client));
+    ASSERT(kNotFound != m_imports.find(client));
+    m_imports.remove(m_imports.find(client));
 }
 
 } // namespace WebCore