commit 376647eaa48754a034ad7faf43ff592f07dab896
author ap@apple.com <ap@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Thu Jan 21 23:19:57 2010 +0000
committer ap@apple.com <ap@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Thu Jan 21 23:19:57 2010 +0000
tree d6eee155078e017ea67a8c03f7ef64e5a1edca6d
parent 5e870671af348879ec87c3de446d455772b9ddcc

        Reviewed by Darin Adler.

        https://bugs.webkit.org/show_bug.cgi?id=33972
        Assertion failure in FrameLoader::checkLoadComplete()

        I couldn't make a test for this, after trying rather hard. I'm not too worried, because such
        a test has to depend on details of current implementation so intimately that it would become
        ineffective very quickly anyway.

        * loader/FrameLoader.cpp: (WebCore::FrameLoader::stopAllLoaders): Stop the check timer, we
        don't need it after aborting load.



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53655 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/loader/FrameLoader.cpp

diff --git a/WebCore/loader/FrameLoader.cpp b/WebCore/loader/FrameLoader.cpp
index afa56e9..095dca6 100644
--- a/WebCore/loader/FrameLoader.cpp
+++ b/WebCore/loader/FrameLoader.cpp
@@ -2310,6 +2310,8 @@
     if (m_documentLoader)
         m_documentLoader->clearArchiveResources();
 
+    m_checkTimer.stop();
+
     m_inStopAllLoaders = false;    
 }