HTML Imports: A speculative fix for fast/dom/custom/imports-custom-element-abort.html

Source/core/html/imports/HTMLImportsController.cpp

Index: Source/core/html/imports/HTMLImportsController.cpp
diff --git a/Source/core/html/imports/HTMLImportsController.cpp b/Source/core/html/imports/HTMLImportsController.cpp
index daae5cb4ca3821294d4b0a357b912af9d9f51e3d..5854b3240b9b0908c7aa4bf970d12b7305d417f0 100644
--- a/Source/core/html/imports/HTMLImportsController.cpp
+++ b/Source/core/html/imports/HTMLImportsController.cpp
@@ -66,6 +66,7 @@ void HTMLImportsController::clear()
     if (m_master)
         m_master->setImport(0);
     m_master = 0;
+    m_recalcTimer.stop();
 }
 
 HTMLImportChild* HTMLImportsController::createChild(const KURL& url, HTMLImport* parent, HTMLImportChildClient* client)
@@ -166,13 +167,15 @@ void HTMLImportsController::stateDidChange()
 
 void HTMLImportsController::scheduleRecalcState()
 {
-    if (m_recalcTimer.isActive())
+    if (m_recalcTimer.isActive() || !m_master)
         return;
     m_recalcTimer.startOneShot(0, FROM_HERE);
 }
 
 void HTMLImportsController::recalcTimerFired(Timer<HTMLImportsController>*)
 {
+    ASSERT(m_master);
+
     do {
         m_recalcTimer.stop();
         HTMLImport::recalcTreeState(this);