HTML Imports: No more BlockingDocumentCreation.

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 61 matching lines @@
         m_loaders[i]->importDestroyed();
     m_loaders.clear();
 
     if (m_master)
         m_master->setImportsController(0);
     m_master = 0;
 
     m_recalcTimer.stop();
 }
 
+static bool makesCyclce(HTMLImport* parent, const KURL& url)

[dominicc (has gone to gerrit), 2014/04/18 00:56:26]

Spelling: cycle

[Hajime Morrita, 2014/04/18 01:48:33]

Done.

+{
+    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, HTMLImport* parent, HTMLImportChildClient* client)
 {
-    OwnPtr<HTMLImportChild> loader = adoptPtr(new HTMLImportChild(*m_master, url, client->isSync() ? HTMLImport::Sync : HTMLImport::Async));
+    HTMLImport::SyncMode mode = client->isSync() && !makesCyclce(parent, url) ? HTMLImport::Sync : HTMLImport::Async;
+    OwnPtr<HTMLImportChild> loader = adoptPtr(new HTMLImportChild(*m_master, url, mode));
     loader->setClient(client);
-    parent->appendChild(loader.get());
+    parent->appendImport(loader.get());
     m_imports.append(loader.release());
     return m_imports.last().get();
 }
 
 HTMLImportChild* HTMLImportsController::load(HTMLImport* parent, HTMLImportChildClient* client, FetchRequest request)
 {
     ASSERT(!request.url().isEmpty() && request.url().isValid());
 
     if (findLinkFor(request.url())) {
         HTMLImportChild* child = createChild(request.url(), parent, client);
@@ skipping 19 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->hasLoader())
+        if (candidate != excluding && equalIgnoringFragmentIdentifier(candidate->url(), url) && candidate->loader())
             return candidate;
     }
 
     return 0;
 }
 
 SecurityOrigin* HTMLImportsController::securityOrigin() const
 {
     return m_master->securityOrigin();
 }
@@ skipping 10 matching lines @@
 
 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->firstImport()->state().shouldBlockScriptExecution();
+        return loader->shouldBlockScriptExecution();
     return state().shouldBlockScriptExecution();
 }
 
 void HTMLImportsController::wasDetachedFrom(const Document& document)
 {
     ASSERT(document.importsController() == this);
     if (m_master == &document)
         clear();
 }
 
-bool HTMLImportsController::hasLoader() const
-{
-    return true;
-}
-
 bool HTMLImportsController::isDone() const
 {
     return !m_master->parsing() && m_master->styleEngine()->haveStylesheetsLoaded();
 }
 
 void HTMLImportsController::stateWillChange()
 {
     scheduleRecalcState();
 }
 
@@ skipping 34 matching lines @@
 {
     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