Remove indirection plumbing from HTMLImportChild.

Source/core/html/imports/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 73 matching lines @@
     if (m_customElementMicrotaskStep)
         CustomElementMicrotaskDispatcher::instance().importDidFinish(m_customElementMicrotaskStep.get());
 }
 
 void HTMLImportChild::didFinishUpgradingCustomElements()
 {
     stateWillChange();
     m_customElementMicrotaskStep.clear();
 }
 
-bool HTMLImportChild::isLoaded() const
-{
-    return m_loader && m_loader->isDone();
-}
-
-bool HTMLImportChild::isFirst() const
-{
-    return m_loader && m_loader->isFirstImport(this);
-}
-
 void HTMLImportChild::importDestroyed()
 {
     if (parent())
         parent()->removeChild(this);
-    if (m_loader) {
-        m_loader->removeImport(this);
-        m_loader = 0;
-    }
+
+    ASSERT(m_loader);
+    m_loader->removeImport(this);
+    m_loader = 0;
 }
 
 Document* HTMLImportChild::document() const
 {
-    return m_loader ? m_loader->document() : 0;
+    ASSERT(m_loader);
+    return m_loader->document();
 }
 
 void HTMLImportChild::stateWillChange()
 {
     toHTMLImportTreeRoot(root())->scheduleRecalcState();
 }
 
 void HTMLImportChild::stateDidChange()
 {
     HTMLImport::stateDidChange();
@@ skipping 19 matching lines @@
     if (!isDone() && !formsCycle()) {
         m_customElementMicrotaskStep = CustomElement::didCreateImport(this)->weakPtr();
     }
 
     for (HTMLImport* child = firstChild(); child; child = child->next())
         toHTMLImportChild(child)->createCustomElementMicrotaskStepIfNeeded();
 }
 
 bool HTMLImportChild::isDone() const
 {
-    return m_loader && m_loader->isDone() && m_loader->microtaskQueue()->isEmpty() && !m_customElementMicrotaskStep;
+    ASSERT(m_loader);
+
+    return m_loader->isDone() && m_loader->microtaskQueue()->isEmpty() && !m_customElementMicrotaskStep;
 }
 
-bool HTMLImportChild::loaderHasError() const
+HTMLImportLoader* HTMLImportChild::loader() const
 {
-    return m_loader && m_loader->hasError();
+    // This should never be called after importDestroyed.
+    ASSERT(m_loader);
+    return m_loader;
 }
 
-
 void HTMLImportChild::setClient(HTMLImportChildClient* client)
 {
     ASSERT(client);
     ASSERT(!m_client);
     m_client = client;
 }
 
 void HTMLImportChild::clearClient()
 {
     // Doesn't check m_client nullity because we allow
@@ skipping 31 matching lines @@
     fprintf(stderr, " loader=%p first=%d, step=%p sync=%s url=%s",
         m_loader,
         isFirst,
         m_customElementMicrotaskStep.get(),
         isSync() ? "Y" : "N",
         url().string().utf8().data());
 }
 #endif
 
 } // namespace WebCore