[import] Cleanup: get rid of ad-hoc state machine.

Source/core/html/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 30 matching lines @@
 void HTMLImportsController::provideTo(Document* master)
 {
     DEFINE_STATIC_LOCAL(const char*, name, ("HTMLImportsController"));
     OwnPtr<HTMLImportsController> controller = adoptPtr(new HTMLImportsController(master));
     master->setImport(controller.get());
     DocumentSupplement::provideTo(master, name, controller.release());
 }
 
 HTMLImportsController::HTMLImportsController(Document* master)
     : m_master(master)
-    , m_unblockTimer(this, &HTMLImportsController::unblockTimerFired)
+    , m_recalcTimer(this, &HTMLImportsController::recalcTimerFired)
 {
+    recalcTreeState(this); // This recomputes initial state.
 }
 
 HTMLImportsController::~HTMLImportsController()
 {
     ASSERT(!m_master);
 }
 
 void HTMLImportsController::clear()
 {
     for (size_t i = 0; i < m_imports.size(); ++i)
@@ skipping 37 matching lines @@
 
 void HTMLImportsController::showSecurityErrorMessage(const String& message)
 {
     m_master->addConsoleMessage(JSMessageSource, ErrorMessageLevel, message);
 }
 
 HTMLImportChild* HTMLImportsController::findLinkFor(const KURL& url, HTMLImport* excluding) const
 {
     for (size_t i = 0; i < m_imports.size(); ++i) {
         HTMLImportChild* candidate = m_imports[i].get();
-        if (candidate != excluding && equalIgnoringFragmentIdentifier(candidate->url(), url) && !candidate->isBlockedFromCreatingDocument())
+        if (candidate != excluding && equalIgnoringFragmentIdentifier(candidate->url(), url) && candidate->hasLoader())
             return candidate;
     }
 
     return 0;
 }
 
 SecurityOrigin* HTMLImportsController::securityOrigin() const
 {
     return m_master->securityOrigin();
 }
@@ skipping 11 matching lines @@
 Document* HTMLImportsController::document() const
 {
     return m_master;
 }
 
 void HTMLImportsController::wasDetachedFromDocument()
 {
     clear();
 }
 
-void HTMLImportsController::didFinishParsing()
-{
-}
-
 bool HTMLImportsController::hasLoader() const
 {
     return true;
 }
 
 bool HTMLImportsController::isDone() const
 {
     return !m_master->parsing();
 }
 
-void HTMLImportsController::blockerGone()
+void HTMLImportsController::scheduleRecalcState()
 {
-    scheduleUnblock();
+    if (m_recalcTimer.isActive())
+        return;
+    m_recalcTimer.startOneShot(0);
 }
 
-void HTMLImportsController::scheduleUnblock()
-{
-    if (m_unblockTimer.isActive())
-        return;
-    m_unblockTimer.startOneShot(0);
-}
-
-void HTMLImportsController::unblockTimerFired(Timer<HTMLImportsController>*)
+void HTMLImportsController::recalcTimerFired(Timer<HTMLImportsController>*)
 {
     do {
-        m_unblockTimer.stop();
-        HTMLImport::unblock(this);
-    } while (m_unblockTimer.isActive());
+        m_recalcTimer.stop();
+        HTMLImport::recalcTreeState(this);
+    } while (m_recalcTimer.isActive());
 }
 
 } // namespace WebCore