Title: [92314] trunk/Source/WebCore
- Revision
- 92314
- Author
- [email protected]
- Date
- 2011-08-03 14:53:16 -0700 (Wed, 03 Aug 2011)
Log Message
webarchive/loading/missing-data.html is failing on Mac
https://bugs.webkit.org/show_bug.cgi?id=63507
Reviewed by Adam Barth.
When loading a main resource from a web archive, make sure that the working URL is actually
the URL of the resource, and not the URL of the web archive itself.
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::receivedFirstData):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (92313 => 92314)
--- trunk/Source/WebCore/ChangeLog 2011-08-03 21:50:48 UTC (rev 92313)
+++ trunk/Source/WebCore/ChangeLog 2011-08-03 21:53:16 UTC (rev 92314)
@@ -1,3 +1,16 @@
+2011-08-03 Anders Carlsson <[email protected]>
+
+ webarchive/loading/missing-data.html is failing on Mac
+ https://bugs.webkit.org/show_bug.cgi?id=63507
+
+ Reviewed by Adam Barth.
+
+ When loading a main resource from a web archive, make sure that the working URL is actually
+ the URL of the resource, and not the URL of the web archive itself.
+
+ * loader/FrameLoader.cpp:
+ (WebCore::FrameLoader::receivedFirstData):
+
2011-08-03 Mark Pilgrim <[email protected]>
Remove LegacyDefaultOptionalArguments flag from DOMWindow.idl
Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (92313 => 92314)
--- trunk/Source/WebCore/loader/FrameLoader.cpp 2011-08-03 21:50:48 UTC (rev 92313)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp 2011-08-03 21:53:16 UTC (rev 92314)
@@ -568,7 +568,10 @@
{
KURL workingURL = activeDocumentLoader()->documentURL();
#if ENABLE(WEB_ARCHIVE) || ENABLE(MHTML)
- if (m_archive)
+ // FIXME: The document loader, not the frame loader, should be in charge of loading web archives.
+ // Once this is done, we can just make DocumentLoader::documentURL() return the right URL
+ // based on whether it has a non-null archive or not.
+ if (m_archive && activeDocumentLoader()->parsedArchiveData())
workingURL = m_archive->mainResource()->url();
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
