Changeset 145752 in webkit

Timestamp:

Mar 13, 2013, 2:27:21 PM (12 years ago)

Author:

Nate Chapin

Message:

chromium's WebFrameTest.ReplaceNavigationAfterHistoryNavigation failing after r145734
​https://bugs.webkit.org/show_bug.cgi?id=112281

Reviewed by Adam Barth.

Fixes the aforementioned chromiun webkit_unit_test

• loader/DocumentLoader.cpp:

(WebCore::DocumentLoader::maybeFinishLoadingMultipartContent): FrameLoader::isReplacing() is not quite

synonymous with loading multipart content. Check that it's actually loading multipart before doing
multipart-specific things.

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-03-13  Nate Chapin  <japhet@chromium.org>
+
+        chromium's WebFrameTest.ReplaceNavigationAfterHistoryNavigation failing after r145734
+        https://bugs.webkit.org/show_bug.cgi?id=112281
+
+        Reviewed by Adam Barth.
+
+        Fixes the aforementioned chromiun webkit_unit_test
+
+        * loader/DocumentLoader.cpp:
+        (WebCore::DocumentLoader::maybeFinishLoadingMultipartContent): FrameLoader::isReplacing() is not quite
+            synonymous with loading multipart content. Check that it's actually loading multipart before doing
+            multipart-specific things.
+
 2013-03-13  Tao Bai  <michaelbai@chromium.org>
 

trunk/Source/WebCore/loader/DocumentLoader.cpp

@@ -1048 +1048 @@
 void DocumentLoader::maybeFinishLoadingMultipartContent()
 {
-    if (!frameLoader()->isReplacing())
+    if (!isMultipartReplacingLoad())
         return;