Extract tree root responsibility out of HTMLImportsController.

Source/core/html/imports/HTMLImportsController.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 14 matching lines @@
  * 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.
  */
 
 #include "config.h"
 #include "core/html/imports/HTMLImportsController.h"
 
 #include "core/dom/Document.h"
-#include "core/dom/StyleEngine.h"
 #include "core/fetch/ResourceFetcher.h"
 #include "core/frame/LocalFrame.h"
 #include "core/html/imports/HTMLImportChild.h"
 #include "core/html/imports/HTMLImportChildClient.h"
 #include "core/html/imports/HTMLImportLoader.h"
+#include "core/html/imports/HTMLImportTreeRoot.h"
 
 namespace WebCore {
 
 void HTMLImportsController::provideTo(Document& master)
 {
     DEFINE_STATIC_LOCAL(const char*, name, ("HTMLImportsController"));
     OwnPtrWillBeRawPtr<HTMLImportsController> controller = adoptPtrWillBeNoop(new HTMLImportsController(master));
     master.setImportsController(controller.get());
     DocumentSupplement::provideTo(master, name, controller.release());
 }
 
 HTMLImportsController::HTMLImportsController(Document& master)
-    : HTMLImport(HTMLImport::Sync)
-    , m_master(&master)
-    , m_recalcTimer(this, &HTMLImportsController::recalcTimerFired)
+    : m_master(&master)
+    , m_root(HTMLImportTreeRoot::create(&master))
 {
-    recalcTreeState(this); // This recomputes initial state.
 }
 
 HTMLImportsController::~HTMLImportsController()
 {
     ASSERT(!m_master);
 }
 
 void HTMLImportsController::clear()
 {
     for (size_t i = 0; i < m_imports.size(); ++i)
         m_imports[i]->importDestroyed();
     m_imports.clear();
 
     for (size_t i = 0; i < m_loaders.size(); ++i)
         m_loaders[i]->importDestroyed();
     m_loaders.clear();
 
     if (m_master)
         m_master->setImportsController(0);
     m_master = 0;
 
-    m_recalcTimer.stop();
+    m_root.clear();
 }
 
 static bool makesCycle(HTMLImport* parent, const KURL& url)
 {
     for (HTMLImport* ancestor = parent; ancestor; ancestor = ancestor->parent()) {
         if (!ancestor->isRoot() && equalIgnoringFragmentIdentifier(toHTMLImportChild(parent)->url(), url))
             return true;
     }
 
     return false;
 }
 
 HTMLImportChild* HTMLImportsController::createChild(const KURL& url, HTMLImportLoader* loader, HTMLImport* parent, HTMLImportChildClient* client)
 {
     HTMLImport::SyncMode mode = client->isSync() && !makesCycle(parent, url) ? HTMLImport::Sync : HTMLImport::Async;
     OwnPtr<HTMLImportChild> child = adoptPtr(new HTMLImportChild(url, loader, mode));
     child->setClient(client);
     parent->appendImport(child.get());
     loader->addImport(child.get());
     m_imports.append(child.release());
     return m_imports.last().get();
 }
 
 HTMLImportChild* HTMLImportsController::load(HTMLImport* parent, HTMLImportChildClient* client, FetchRequest request)
 {
     ASSERT(!request.url().isEmpty() && request.url().isValid());
-    ASSERT(parent == this || toHTMLImportChild(parent)->loader()->isFirstImport(toHTMLImportChild(parent)));
+    ASSERT(parent == root() || toHTMLImportChild(parent)->loader()->isFirstImport(toHTMLImportChild(parent)));
 
     if (HTMLImportChild* childToShareWith = findLinkFor(request.url())) {
         HTMLImportLoader* loader = childToShareWith->loader();
         ASSERT(loader);
         HTMLImportChild* child = createChild(request.url(), loader, parent, client);
         child->didShareLoader();
         return child;
     }
 
     bool sameOriginRequest = securityOrigin()->canRequest(request.url());
@@ skipping 38 matching lines @@
 ResourceFetcher* HTMLImportsController::fetcher() const
 {
     return m_master->fetcher();
 }
 
 LocalFrame* HTMLImportsController::frame() const
 {
     return m_master->frame();
 }
 
-Document* HTMLImportsController::document() const
-{
-    return m_master;
-}
-
 bool HTMLImportsController::shouldBlockScriptExecution(const Document& document) const
 {
     ASSERT(document.importsController() == this);
     if (HTMLImportLoader* loader = loaderFor(document))
         return loader->shouldBlockScriptExecution();
-    return state().shouldBlockScriptExecution();
+    return root()->state().shouldBlockScriptExecution();
 }
 
 void HTMLImportsController::wasDetachedFrom(const Document& document)
 {
     ASSERT(document.importsController() == this);
     if (m_master == &document)
         clear();
 }
 
-bool HTMLImportsController::isDone() const
-{
-    return !m_master->parsing() && m_master->styleEngine()->haveStylesheetsLoaded();
-}
-
-void HTMLImportsController::stateWillChange()
-{
-    scheduleRecalcState();
-}
-
-void HTMLImportsController::stateDidChange()
-{
-    HTMLImport::stateDidChange();
-
-    if (!state().isReady())
-        return;
-    if (LocalFrame* frame = m_master->frame())
-        frame->loader().checkCompleted();
-}
-
-void HTMLImportsController::scheduleRecalcState()
-{
-    if (m_recalcTimer.isActive() || !m_master)
-        return;
-    m_recalcTimer.startOneShot(0, FROM_HERE);
-}
-
-void HTMLImportsController::recalcTimerFired(Timer<HTMLImportsController>*)
-{
-    ASSERT(m_master);
-
-    do {
-        m_recalcTimer.stop();
-        HTMLImport::recalcTreeState(this);
-    } while (m_recalcTimer.isActive());
-}
-
 HTMLImportLoader* HTMLImportsController::createLoader()
 {
     m_loaders.append(HTMLImportLoader::create(this));
     return m_loaders.last().get();
 }
 
 HTMLImportLoader* HTMLImportsController::loaderFor(const Document& document) const
 {
     for (size_t i = 0; i < m_loaders.size(); ++i) {
         if (m_loaders[i]->document() == &document)
             return m_loaders[i].get();
     }
 
     return 0;
 }
 
 } // namespace WebCore