Remove indirection plumbing from HTMLImportChild.

Remove indirection plumbing from HTMLImportChild.

The indirection plumbing obscures what is really happening at the callsites
and should be removed. Also, strengthen up the assertions, since
now HTMLImportChild has HTMLImportLoader for (observable) life.

R=morrita@chromium.org
BUG=

Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=175244

[dglazkov, 2014-05-28 21:00:15]

PTAL, I replaced a bunch of 0-checks with ASSERTS. Crashing is more exciting, I
think.

[Hajime Morrita, 2014-05-28 21:21:57]

lgtm.

On 2014/05/28 21:00:15, dglazkov wrote:
> PTAL, I replaced a bunch of 0-checks with ASSERTS. Crashing is more exciting,
I
> think.
Probably ;-)

[dglazkov, 2014-06-01 21:53:19]

The CQ bit was checked by dglazkov@chromium.org

[commit-bot: I haz the power, 2014-06-01 21:53:30]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/dglazkov@chromium.org/299313013/60001

[commit-bot: I haz the power, 2014-06-01 21:53:36]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-06-01 21:53:36]

Failed to apply patch for Source/core/html/imports/HTMLImportChild.cpp:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file Source/core/html/imports/HTMLImportChild.cpp
  Hunk #1 succeeded at 91 (offset 1 line).
  Hunk #2 FAILED at 143.
  1 out of 2 hunks FAILED -- saving rejects to file
Source/core/html/imports/HTMLImportChild.cpp.rej

Patch:       Source/core/html/imports/HTMLImportChild.cpp
Index: Source/core/html/imports/HTMLImportChild.cpp
diff --git a/Source/core/html/imports/HTMLImportChild.cpp
b/Source/core/html/imports/HTMLImportChild.cpp
index
791a6d08b6e1c73d4764909116535e0dcf2667a0..57a42c49ed55b043b4b8c1f799b25b9e074d3821
100644
--- a/Source/core/html/imports/HTMLImportChild.cpp
+++ b/Source/core/html/imports/HTMLImportChild.cpp
@@ -90,29 +90,20 @@ void HTMLImportChild::didFinishUpgradingCustomElements()
     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()
@@ -152,12 +143,15 @@ void
HTMLImportChild::createCustomElementMicrotaskStepIfNeeded()
 
 bool HTMLImportChild::isDone() const
 {
-    return m_loader && m_loader->isDone() &&
!m_loader->microtaskQueue()->needsProcessOrStop() &&
!m_customElementMicrotaskStep;
+    ASSERT(m_loader);
+    return m_loader->isDone() &&
!m_loader->microtaskQueue()->needsProcessOrStop() &&
!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;
 }

[dglazkov, 2014-06-01 23:02:20]

The CQ bit was checked by dglazkov@chromium.org

[commit-bot: I haz the power, 2014-06-01 23:02:32]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/dglazkov@chromium.org/299313013/80001

[commit-bot: I haz the power, 2014-06-01 23:47:04]

FYI, CQ is re-trying this CL (attempt #1).
The failing builders are:
  linux_blink_dbg on tryserver.blink
(http://build.chromium.org/p/tryserver.blink/builders/linux_blink_dbg/builds/1...)
  mac_blink_rel on tryserver.blink
(http://build.chromium.org/p/tryserver.blink/builders/mac_blink_rel/builds/9761)
  win_blink_rel on tryserver.blink
(http://build.chromium.org/p/tryserver.blink/builders/win_blink_rel/builds/10077)
  win_gpu_triggered_tests on tryserver.chromium.gpu
(http://build.chromium.org/p/tryserver.chromium.gpu/builders/win_gpu_triggered...)

[commit-bot: I haz the power, 2014-06-01 23:47:21]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-06-01 23:47:21]

Try jobs failed on following builders:
  win_gpu_triggered_tests on tryserver.chromium.gpu
(http://build.chromium.org/p/tryserver.chromium.gpu/builders/win_gpu_triggered...)

[dglazkov, 2014-06-02 00:24:43]

The CQ bit was checked by dglazkov@chromium.org

[commit-bot: I haz the power, 2014-06-02 00:24:50]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/dglazkov@chromium.org/299313013/80001

[commit-bot: I haz the power, 2014-06-02 01:37:49]

FYI, CQ is re-trying this CL (attempt #1).
The failing builders are:
  win_blink_rel on tryserver.blink
(http://build.chromium.org/p/tryserver.blink/builders/win_blink_rel/builds/10081)

[commit-bot: I haz the power, 2014-06-02 02:24:27]

Change committed as 175244