Chromium Code Reviews| Index: Source/core/fetch/ResourceFetcher.cpp |
| diff --git a/Source/core/fetch/ResourceFetcher.cpp b/Source/core/fetch/ResourceFetcher.cpp |
| index 81f56c4d602211d12db00e585140c541e7124199..a6e166eab8918ee201cc61a269f9fa817657a229 100644 |
| --- a/Source/core/fetch/ResourceFetcher.cpp |
| +++ b/Source/core/fetch/ResourceFetcher.cpp |
| @@ -1242,10 +1242,16 @@ void ResourceFetcher::requestPreload(Resource::Type type, FetchRequest& request, |
| if (type == Resource::MainResource) |
| return; |
| + ASSERT(type == Resource::Script || type == Resource::CSSStyleSheet || type == Resource::Image); |
|
Mike West
2014/11/11 13:34:18
Is this an exhaustive list of what goes through th
|
| + |
| String encoding; |
| - if (type == Resource::Script || type == Resource::CSSStyleSheet) |
| + if (type == Resource::Script || type == Resource::CSSStyleSheet) { |
| encoding = charset.isEmpty() ? m_document->charset().string() : charset; |
| + // RequestContext for Resource::Image is set in fetchImage below. |
| + determineRequestContext(request.mutableResourceRequest(), type); |
| + } |
| + |
| request.setCharset(encoding); |
| request.setForPreload(true); |
| @@ -1253,6 +1259,7 @@ void ResourceFetcher::requestPreload(Resource::Type type, FetchRequest& request, |
| // Loading images involves several special cases, so use dedicated fetch method instead. |
| if (type == Resource::Image) |
| resource = fetchImage(request); |
| + |
| if (!resource) |
| resource = requestResource(type, request); |
| if (!resource || (m_preloads && m_preloads->contains(resource.get()))) |