[import] Refactoring: Get rid of BlockedFromCreatingDocument state

Source/core/html/HTMLImport.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 36 matching lines @@
 
 HTMLImportsController* HTMLImport::controller()
 {
     return root()->toController();
 }
 
 void HTMLImport::appendChild(HTMLImport* child)
 {
     if (isBlockedFromRunningScript())
         child->blockFromRunningScript();
-    if (lastChild() && lastChild()->isBlockingFollowersFromCreatingDocument())
-        child->blockFromCreatingDocument();
     TreeNode<HTMLImport>::appendChild(child);
     if (child->isCreatedByParser())
         blockPredecessorsOf(child);
 }
 
-inline bool HTMLImport::isBlockedFromCreatingDocumentByPredecessors() const
+bool HTMLImport::isBlockedFromCreatingDocument() const
 {
-    ASSERT(isBlockedFromCreatingDocument());
-    HTMLImport* elder = previous();
-    return (elder && !elder->isDone());
+    if (hasLoader())
+        return false;
+    return previous() && previous()->isBlockingFollowersFromCreatingDocument();
 }
 
 bool HTMLImport::isBlockedFromRunningScriptByPredecessors() const
 {
     HTMLImport* parent = this->parent();
     if (!parent)
         return false;
 
     for (HTMLImport* sibling = parent->firstChild(); sibling; sibling = sibling->next()) {
         if (sibling == this)
@@ skipping 10 matching lines @@
     if (WaitingLoaderOrChildren < m_state)
         m_state = WaitingLoaderOrChildren;
 }
 
 void HTMLImport::blockFromRunningScript()
 {
     if (BlockedFromRunningScript < m_state)
         m_state = BlockedFromRunningScript;
 }
 
-void HTMLImport::blockFromCreatingDocument()
-{
-    if (BlockedFromCreatingDocument < m_state)
-        m_state = BlockedFromCreatingDocument;
-}
-
 void HTMLImport::becomeReady()
 {
     if (!isBlocked())
         return;
     m_state = Ready;
     didBecomeReady();
 }
 
 void HTMLImport::unblockFromRunningScript()
 {
     if (!isBlockedFromRunningScript())
         return;
     m_state = WaitingLoaderOrChildren;
     didUnblockFromRunningScript();
 }
 
-void HTMLImport::unblockFromCreatingDocument()
-{
-    if (!isBlockedFromCreatingDocument())
-        return;
-    m_state = BlockedFromRunningScript;
-    didUnblockFromCreatingDocument();
-}
-
 void HTMLImport::didUnblockFromRunningScript()
 {
     ASSERT(!isBlockedFromCreatingDocument());
     ASSERT(!isBlockedFromRunningScript());
     if (Document* document = this->document())
         document->didLoadAllImports();
 }
 
 void HTMLImport::didBecomeReady()
 {
     ASSERT(isDone());
 }
 
 void HTMLImport::didUnblockFromCreatingDocument()
 {
     ASSERT(!isBlockedFromCreatingDocument());
 }
 
 void HTMLImport::loaderWasResolved()
 {
-    unblockFromCreatingDocument();
     unblockFromRunningScript();
 }
 
 void HTMLImport::loaderDidFinish()
 {
     if (m_state == WaitingLoaderOrChildren)
         becomeReady();
     root()->blockerGone();
 }
 
@@ skipping 12 matching lines @@
 
 inline bool HTMLImport::isBlockingFollowersFromCreatingDocument() const
 {
     return !isDone();
 }
 
 bool HTMLImport::unblock(HTMLImport* import)
 {
     ASSERT(!import->isBlockedFromRunningScriptByPredecessors());
 
-    if (import->isBlockedFromCreatingDocument() && import->isBlockedFromCreatingDocumentByPredecessors())
+    if (import->isBlockedFromCreatingDocument())
         return false;
-    import->unblockFromCreatingDocument();
+    import->didUnblockFromCreatingDocument();
 
     for (HTMLImport* child = import->firstChild(); child; child = child->next()) {
         if (!unblock(child))
             return false;
     }
 
     import->unblockFromRunningScript();
     if (import->isDone())
         import->becomeReady();
 
@@ skipping 25 matching lines @@
 }
 
 bool HTMLImport::isMaster(Document* document)
 {
     if (!document->import())
         return true;
     return (document->import()->master() == document);
 }
 
 } // namespace WebCore