[import] Refactoring: Get rid of BlockedFromCreatingDocument state

Source/core/html/HTMLImportChild.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 51 matching lines @@
         TemporaryChange<bool> traversing(m_traversingClients, true);
         m_clients[i]->importChildWasDestroyed(this);
     }
 }
 
 void HTMLImportChild::wasAlreadyLoaded()
 {
     ASSERT(!m_loader);
     ASSERT(m_clients.size());
 
+    ensureLoader();
     loaderWasResolved();
-    ensureLoader();
 }
 
 void HTMLImportChild::startLoading(const ResourcePtr<RawResource>& resource)
 {
     ASSERT(!hasResource());
     ASSERT(!m_loader);
 
     if (isCreatedByParser()) {
         ASSERT(!m_customElementMicrotaskStep);
         m_customElementMicrotaskStep = CustomElement::didCreateImport(this);
@@ skipping 70 matching lines @@
     ASSERT(m_loader->isOwnedBy(this));
     m_loader->didFinishParsing();
 }
 
 // Once all preceding imports are loaded and "document blocking" ends,
 // HTMLImportChild can decide whether it should load the import by itself
 // or it can share existing one.
 void HTMLImportChild::didUnblockFromCreatingDocument()
 {
     HTMLImport::didUnblockFromCreatingDocument();
-    ASSERT(!m_loader || !m_loader->isOwnedBy(this));
     ensureLoader();
 }
 
 void HTMLImportChild::didBecomeReady()
 {
     HTMLImport::didBecomeReady();
     didFinish();
 }
 
 void HTMLImportChild::ensureLoader()
@@ skipping 22 matching lines @@
     m_loader = loader->m_loader;
     m_loader->addClient(this);
     root()->blockerGone();
 }
 
 bool HTMLImportChild::isDone() const
 {
     return m_loader && m_loader->isDone();
 }
 
+bool HTMLImportChild::hasLoader() const
+{
+    return m_loader;
+}
+
 bool HTMLImportChild::ownsLoader() const
 {
     return m_loader->isOwnedBy(this);
 }
 
 bool HTMLImportChild::loaderHasError() const
 {
     return m_loader && m_loader->hasError();
 }
 
 
 void HTMLImportChild::addClient(HTMLImportChildClient* client)
 {
     ASSERT(!m_traversingClients);
     ASSERT(!m_clients.contains(client));
     m_clients.append(client);
 }
 
 void HTMLImportChild::removeClient(HTMLImportChildClient* client)
 {
     ASSERT(!m_traversingClients);
     size_t i = m_clients.find(client);
     ASSERT(i != kNotFound);
     m_clients.remove(i);
 }
 
 } // namespace WebCore