[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.18-1-697-g2f78b87

[eric at webkit.org]

The following commit has been merged in the debian/unstable branch:
commit dc6dc01776034858a794999451140fddac2b26eb
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 13 01:29:35 2010 +0000

    2010-01-12  Tony Chang  <tony at chromium.org>
    
            Reviewed by Adam Barth.
    
            Fix an assert being triggered by how the Chromium port sets the
            replacing flag for error pages.  This was caused by r53143.
    
            Covered by existing Chromium UI tests.
    
            * loader/FrameLoader.cpp:
            (WebCore::FrameLoader::checkLoadCompleteForThisFrame):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53171 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 1e1faf0..96900e3 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-01-12  Tony Chang  <tony at chromium.org>
+
+        Reviewed by Adam Barth.
+
+        Fix an assert being triggered by how the Chromium port sets the
+        replacing flag for error pages.  This was caused by r53143.
+
+        Covered by existing Chromium UI tests.
+
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::checkLoadCompleteForThisFrame):
+
 2010-01-12  Kent Hansen  <kent.hansen at nokia.com>
 
         Reviewed by Geoffrey Garen.
diff --git a/WebCore/loader/FrameLoader.cpp b/WebCore/loader/FrameLoader.cpp
index 2683209..314ca33 100644
--- a/WebCore/loader/FrameLoader.cpp
+++ b/WebCore/loader/FrameLoader.cpp
@@ -2922,7 +2922,8 @@ void FrameLoader::checkLoadCompleteForThisFrame()
                 stopLoadingSubframes();
                 pdl->stopLoading();
 
-                if (isReplacing())
+                // If we're in the middle of loading multipart data, we need to restore the document loader.
+                if (isReplacing() && !m_documentLoader.get())
                     setDocumentLoader(m_provisionalDocumentLoader.get());
 
                 // Finish resetting the load state, but only if another load hasn't been started by the

-- 
WebKit Debian packaging