Oilpan: dispose an HTMLImportsController on document detach/removal.

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 38 matching lines @@
     , m_weakFactory(this)
 #endif
     , m_loader(loader)
     , m_client(nullptr)
 {
 }
 
 HTMLImportChild::~HTMLImportChild()
 {
 #if !ENABLE(OILPAN)
-    // importDestroyed() should be called before the destruction.
+    // dispose() should be called before the destruction.
     ASSERT(!m_loader);
 
     if (m_client)
         m_client->importChildWasDestroyed(this);
 #endif
 }
 
 void HTMLImportChild::ownerInserted()
 {
     if (!m_loader->isDone())
@@ skipping 23 matching lines @@
     stateWillChange();
     CustomElement::didFinishLoadingImport(*(root()->document()));
 }
 
 void HTMLImportChild::didFinishUpgradingCustomElements()
 {
     stateWillChange();
     m_customElementMicrotaskStep.clear();
 }
 
-#if !ENABLE(OILPAN)
-void HTMLImportChild::importDestroyed()
+void HTMLImportChild::dispose()
 {
     if (parent())
         parent()->removeChild(this);
 
     ASSERT(m_loader);
     m_loader->removeImport(this);
     m_loader = nullptr;
 }
-#endif
 
 Document* HTMLImportChild::document() const
 {
     ASSERT(m_loader);
     return m_loader->document();
 }
 
 void HTMLImportChild::stateWillChange()
 {
     toHTMLImportTreeRoot(root())->scheduleRecalcState();
@@ skipping 30 matching lines @@
 
 bool HTMLImportChild::isDone() const
 {
     ASSERT(m_loader);
 
     return m_loader->isDone() && m_loader->microtaskQueue()->isEmpty() && !m_customElementMicrotaskStep;
 }
 
 HTMLImportLoader* HTMLImportChild::loader() const
 {
-    // This should never be called after importDestroyed.
+    // This should never be called after dispose().
     ASSERT(m_loader);
     return m_loader;
 }
 
 void HTMLImportChild::setClient(HTMLImportChildClient* client)
 {
     ASSERT(client);
     ASSERT(!m_client);
     m_client = client;
 }
@@ skipping 48 matching lines @@
 
 DEFINE_TRACE(HTMLImportChild)
 {
     visitor->trace(m_customElementMicrotaskStep);
     visitor->trace(m_loader);
     visitor->trace(m_client);
     HTMLImport::trace(visitor);
 }
 
 } // namespace blink