Title: [145752] trunk/Source/WebCore
- Revision
- 145752
- Author
- [email protected]
- Date
- 2013-03-13 14:27:21 -0700 (Wed, 13 Mar 2013)
Log 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.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (145751 => 145752)
--- trunk/Source/WebCore/ChangeLog 2013-03-13 21:26:19 UTC (rev 145751)
+++ trunk/Source/WebCore/ChangeLog 2013-03-13 21:27:21 UTC (rev 145752)
@@ -1,3 +1,17 @@
+2013-03-13 Nate Chapin <[email protected]>
+
+ 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 <[email protected]>
Add the default video poster if it doesn't exist in video tag
Modified: trunk/Source/WebCore/loader/DocumentLoader.cpp (145751 => 145752)
--- trunk/Source/WebCore/loader/DocumentLoader.cpp 2013-03-13 21:26:19 UTC (rev 145751)
+++ trunk/Source/WebCore/loader/DocumentLoader.cpp 2013-03-13 21:27:21 UTC (rev 145752)
@@ -1047,7 +1047,7 @@
void DocumentLoader::maybeFinishLoadingMultipartContent()
{
- if (!frameLoader()->isReplacing())
+ if (!isMultipartReplacingLoad())
return;
frameLoader()->setupForReplace();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
