Title: [137364] trunk/Source/WebCore
- Revision
- 137364
- Author
- [email protected]
- Date
- 2012-12-11 14:51:39 -0800 (Tue, 11 Dec 2012)
Log Message
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (137363 => 137364)
--- trunk/Source/WebCore/ChangeLog 2012-12-11 22:45:20 UTC (rev 137363)
+++ trunk/Source/WebCore/ChangeLog 2012-12-11 22:51:39 UTC (rev 137364)
@@ -1,3 +1,16 @@
+2012-12-11 Nate Chapin <[email protected]>
+
+ Ensure ResourceRequests for main resources include fragment indentifiers when necessary,
+ regressed by r137333.
+ https://bugs.webkit.org/show_bug.cgi?id=104721
+
+ Rubber-stamped by Dimitri Glazkov.
+
+ No new tests.
+
+ * loader/SubresourceLoader.cpp:
+ (WebCore::SubresourceLoader::willSendRequest):
+
2012-12-11 Huang Dongsung <[email protected]>
[GTK] REGRESSION(r135620): Accelerated Compositing does not draw some pages.
Modified: trunk/Source/WebCore/loader/SubresourceLoader.cpp (137363 => 137364)
--- trunk/Source/WebCore/loader/SubresourceLoader.cpp 2012-12-11 22:45:20 UTC (rev 137363)
+++ trunk/Source/WebCore/loader/SubresourceLoader.cpp 2012-12-11 22:51:39 UTC (rev 137364)
@@ -146,6 +146,16 @@
if (newRequest.isNull() || reachedTerminalState())
return;
+ // MemoryCache removes the fragment identifier from CachedResources to make url matching easier. Main resources really should have
+ // that on the outgoing ResourceRequest, so add it back here.
+ // FIXME: This is probably a bad place to add the fragment back in. CachedResource should probably hold the fragment and clean up after itself.
+ // See https://bugs.webkit.org/show_bug.cgi?id=104721
+ if (m_resource->type() == CachedResource::MainResource && documentLoader()->url().hasFragmentIdentifier()) {
+ KURL url = ""
+ url.setFragmentIdentifier(documentLoader()->url().fragmentIdentifier());
+ newRequest.setURL(url);
+ }
+
ResourceLoader::willSendRequest(newRequest, redirectResponse);
if (newRequest.isNull())
cancel();
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
