[import] Refactoring: Get rid of HTMLImport::isProcessing()

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 118 matching lines @@
 void HTMLImport::didUnblockFromRunningScript()
 {
     ASSERT(!isBlockedFromCreatingDocument());
     ASSERT(!isBlockedFromRunningScript());
     if (Document* document = this->document())
         document->didLoadAllImports();
 }
 
 void HTMLImport::didBecomeReady()
 {
-    ASSERT(!isProcessing());
+    ASSERT(isDone());
 }
 
 void HTMLImport::didUnblockFromCreatingDocument()
 {
     ASSERT(!isBlockedFromCreatingDocument());
 }
 
 void HTMLImport::loaderWasResolved()
 {
     unblockFromCreatingDocument();
     unblockFromRunningScript();
 }
 
 void HTMLImport::loaderDidFinish()
 {
     if (m_state == WaitingLoaderOrChildren)
         becomeReady();
     root()->blockerGone();
 }
 
 inline bool HTMLImport::isBlockingFollowersFromRunningScript() const
 {
-    return (isBlockedFromRunningScript() || isProcessing()) && isCreatedByParser();
+    if (!isCreatedByParser())
+        return false;
+    if (isBlockedFromRunningScript())
+        return true;
+    // Blocking here can result dead lock if the node doesn't own loader and has shared loader.
+    // Because the shared loader can point its ascendant and forms a cycle.
+    if (!ownsLoader())
+        return false;
+    return !isDone();
 }
 
 inline bool HTMLImport::isBlockingFollowersFromCreatingDocument() const
 {
     return !isDone();
 }
 
 bool HTMLImport::unblock(HTMLImport* import)
 {
     ASSERT(!import->isBlockedFromRunningScriptByPredecessors());
 
     if (import->isBlockedFromCreatingDocument() && import->isBlockedFromCreatingDocumentByPredecessors())
         return false;
     import->unblockFromCreatingDocument();
 
     for (HTMLImport* child = import->firstChild(); child; child = child->nextSibling()) {
         if (!unblock(child))
             return false;
     }
 
     import->unblockFromRunningScript();
-    if (!import->isProcessing())
+    if (import->isDone())
         import->becomeReady();
 
     return !import->isBlockingFollowersFromRunningScript();
 }
 
 void HTMLImport::block(HTMLImport* import)
 {
     for (HTMLImport* child = import; child; child = traverseNext(*child, import))
         child->blockFromRunningScript();
 }
@@ skipping 17 matching lines @@
 }
 
 bool HTMLImport::isMaster(Document* document)
 {
     if (!document->import())
         return true;
     return (document->import()->master() == document);
 }
 
 } // namespace WebCore