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

Source/core/html/imports/HTMLImportsController.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 48 matching lines @@
     ASSERT(!m_master);
 }
 
 void HTMLImportsController::clear()
 {
     for (size_t i = 0; i < m_imports.size(); ++i)
         m_imports[i]->importDestroyed();
     if (m_master)
         m_master->setImport(0);
     m_master = 0;
+    m_recalcTimer.stop();
 }
 
 HTMLImportChild* HTMLImportsController::createChild(const KURL& url, HTMLImport* parent, HTMLImportChildClient* client)
 {
     OwnPtr<HTMLImportChild> loader = adoptPtr(new HTMLImportChild(*m_master, url, client->isSync()));
     loader->setClient(client);
     parent->appendChild(loader.get());
     m_imports.append(loader.release());
     return m_imports.last().get();
 }
@@ skipping 80 matching lines @@
     HTMLImport::stateDidChange();
 
     if (!state().isReady())
         return;
     if (LocalFrame* frame = m_master->frame())
         frame->loader().checkCompleted();
 }
 
 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);
     } while (m_recalcTimer.isActive());
 }
 
 } // namespace WebCore