Changeset 53171 in webkit

Timestamp:

Jan 12, 2010 5:29:35 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-01-12 Tony Chang <​tony@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):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/FrameLoader.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-01-12  Tony Chang  <tony@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@nokia.com>
 

trunk/WebCore/loader/FrameLoader.cpp

@@ -2923 +2923 @@
                 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());