[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

[ap at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit 7db01aeae3114a4eb735fb0bce203531a9cdd146
Author: ap at apple.com <ap at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 21 23:19:57 2010 +0000

            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

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 752a3b5..91c0bfa 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-01-21  Alexey Proskuryakov  <ap at apple.com>
+
+        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.
+
 2010-01-21  Csaba Osztrogonác  <ossy at webkit.org>
 
         Reviewed by Dave Hyatt.
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 @@ void FrameLoader::stopAllLoaders(DatabasePolicy databasePolicy)
     if (m_documentLoader)
         m_documentLoader->clearArchiveResources();
 
+    m_checkTimer.stop();
+
     m_inStopAllLoaders = false;    
 }
 

-- 
WebKit Debian packaging