chromium's WebFrameTest.ReplaceNavigationAfterHistoryNavigation failing after r145734
authorjaphet@chromium.org <japhet@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 13 Mar 2013 21:27:21 +0000 (21:27 +0000)
committerjaphet@chromium.org <japhet@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 13 Mar 2013 21:27:21 +0000 (21:27 +0000)
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.

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

Source/WebCore/ChangeLog
Source/WebCore/loader/DocumentLoader.cpp

index bc99200..091858a 100644 (file)
@@ -1,3 +1,17 @@
+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>
 
         Add the default video poster if it doesn't exist in video tag
index e7dc9de..b9851a1 100644 (file)
@@ -1047,7 +1047,7 @@ void DocumentLoader::subresourceLoaderFinishedLoadingOnePart(ResourceLoader* loa
 
 void DocumentLoader::maybeFinishLoadingMultipartContent()
 {
-    if (!frameLoader()->isReplacing())
+    if (!isMultipartReplacingLoad())
         return;
 
     frameLoader()->setupForReplace();