Title: [100852] trunk/Source/WebCore
- Revision
- 100852
- Author
- [email protected]
- Date
- 2011-11-19 00:45:01 -0800 (Sat, 19 Nov 2011)
Log Message
When loading a MHTML document, make sure we set the base URL before
we notify the frame was committed (so the document has the right base
URL when the notification happens).
https://bugs.webkit.org/show_bug.cgi?id=72788
Reviewed by Adam Barth.
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::receivedFirstData):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (100851 => 100852)
--- trunk/Source/WebCore/ChangeLog 2011-11-19 08:25:10 UTC (rev 100851)
+++ trunk/Source/WebCore/ChangeLog 2011-11-19 08:45:01 UTC (rev 100852)
@@ -1,3 +1,15 @@
+2011-11-19 Jay Civelli <[email protected]>
+
+ When loading a MHTML document, make sure we set the base URL before
+ we notify the frame was committed (so the document has the right base
+ URL when the notification happens).
+ https://bugs.webkit.org/show_bug.cgi?id=72788
+
+ Reviewed by Adam Barth.
+
+ * loader/FrameLoader.cpp:
+ (WebCore::FrameLoader::receivedFirstData):
+
2011-11-19 Adam Barth <[email protected]>
Integrate Source/WTF with the Chromium build system
Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (100851 => 100852)
--- trunk/Source/WebCore/loader/FrameLoader.cpp 2011-11-19 08:25:10 UTC (rev 100851)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp 2011-11-19 08:45:01 UTC (rev 100852)
@@ -574,9 +574,6 @@
activeDocumentLoader()->writer()->begin(workingURL, false);
activeDocumentLoader()->writer()->setDocumentWasLoadedAsPartOfNavigation();
- dispatchDidCommitLoad();
- dispatchDidClearWindowObjectsInAllWorlds();
-
#if ENABLE(MHTML)
if (m_archive) {
// The origin is the MHTML file, we need to set the base URL to the document encoded in the MHTML so
@@ -585,6 +582,9 @@
}
#endif
+ dispatchDidCommitLoad();
+ dispatchDidClearWindowObjectsInAllWorlds();
+
if (m_documentLoader) {
StringWithDirection ptitle = m_documentLoader->title();
// If we have a title let the WebView know about it.
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
