Oilpan: dispose an HTMLImportsController on document detach/removal.

Source/core/html/imports/HTMLImportLoader.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 36 matching lines @@
 HTMLImportLoader::HTMLImportLoader(HTMLImportsController* controller)
     : m_controller(controller)
     , m_state(StateLoading)
     , m_microtaskQueue(CustomElementSyncMicrotaskQueue::create())
 {
 }
 
 HTMLImportLoader::~HTMLImportLoader()
 {
 #if !ENABLE(OILPAN)
-    clear();
+    dispose();
 #endif
 }
 
-#if !ENABLE(OILPAN)
-void HTMLImportLoader::importDestroyed()
-{
-    clear();
-}
-
-void HTMLImportLoader::clear()
+void HTMLImportLoader::dispose()
 {
     m_controller = nullptr;
     if (m_document) {
-        m_document->setImportsController(0);
+        m_document->setImportsController(nullptr);
         m_document->cancelParsing();
         m_document.clear();
     }
 }
-#endif
 
 void HTMLImportLoader::startLoading(const ResourcePtr<RawResource>& resource)
 {
     setResource(resource);
 }
 
 void HTMLImportLoader::responseReceived(Resource* resource, const ResourceResponse& response, PassOwnPtr<WebDataConsumerHandle> handle)
 {
     ASSERT_UNUSED(handle, !handle);
     // Resource may already have been loaded with the import loader
@@ skipping 113 matching lines @@
 void HTMLImportLoader::addImport(HTMLImportChild* import)
 {
     ASSERT(kNotFound == m_imports.find(import));
 
     m_imports.append(import);
     import->normalize();
     if (isDone())
         import->didFinishLoading();
 }
 
-#if !ENABLE(OILPAN)
 void HTMLImportLoader::removeImport(HTMLImportChild* client)
 {
     ASSERT(kNotFound != m_imports.find(client));
     m_imports.remove(m_imports.find(client));
 }
-#endif
 
 bool HTMLImportLoader::shouldBlockScriptExecution() const
 {
     return firstImport()->state().shouldBlockScriptExecution();
 }
 
 PassRefPtrWillBeRawPtr<CustomElementSyncMicrotaskQueue> HTMLImportLoader::microtaskQueue() const
 {
     return m_microtaskQueue;
 }
 
 DEFINE_TRACE(HTMLImportLoader)
 {
     visitor->trace(m_controller);
 #if ENABLE(OILPAN)
     visitor->trace(m_imports);
 #endif
     visitor->trace(m_document);
     visitor->trace(m_writer);
     visitor->trace(m_microtaskQueue);
     DocumentParserClient::trace(visitor);
 }
 
 } // namespace blink