Chromium Code Reviews| Index: Source/core/loader/DocumentLoader.cpp |
| diff --git a/Source/core/loader/DocumentLoader.cpp b/Source/core/loader/DocumentLoader.cpp |
| index efda9fdbfd8c93b84b631c500c4bc38699e290e3..d33bac71eb85605458a8be43043bf3d6a346b284 100644 |
| --- a/Source/core/loader/DocumentLoader.cpp |
| +++ b/Source/core/loader/DocumentLoader.cpp |
| @@ -48,6 +48,7 @@ |
| #include "core/inspector/InspectorInstrumentation.h" |
| #include "core/loader/FrameLoader.h" |
| #include "core/loader/FrameLoaderClient.h" |
| +#include "core/loader/LinkLoader.h" |
| #include "core/loader/UniqueIdentifier.h" |
| #include "core/loader/appcache/ApplicationCacheHost.h" |
| #include "core/page/FrameTree.h" |
| @@ -409,6 +410,7 @@ void DocumentLoader::responseReceived(Resource* resource, const ResourceResponse |
| ASSERT_UNUSED(resource, m_mainResource == resource); |
| ASSERT_UNUSED(handle, !handle); |
| RefPtr<DocumentLoader> protect(this); |
| + ASSERT(frame()); |
| m_applicationCacheHost->didReceiveResponseForMainResource(response); |
| @@ -441,6 +443,9 @@ void DocumentLoader::responseReceived(Resource* resource, const ResourceResponse |
| return; |
| } |
| + if (resource && resource->type() == Resource::MainResource) |
|
Mike West
2015/02/06 12:22:06
Do we not load for subframes?
|
| + LinkLoader::loadLinkFromHeader(response.httpHeaderField("Link"), frame()->document()); |
| + |
| ASSERT(!mainResourceLoader() || !mainResourceLoader()->defersLoading()); |
| m_response = response; |