| Index: Source/core/fetch/ResourceFetcher.cpp
|
| diff --git a/Source/core/fetch/ResourceFetcher.cpp b/Source/core/fetch/ResourceFetcher.cpp
|
| index 32c30fb042aec5e048d326fbfda106c81e195b76..d3f770882c0aff4fecc8901d449675cfa83d0071 100644
|
| --- a/Source/core/fetch/ResourceFetcher.cpp
|
| +++ b/Source/core/fetch/ResourceFetcher.cpp
|
| @@ -107,8 +107,8 @@ static Resource* createResource(Resource::Type type, const ResourceRequest& requ
|
|
|
| static ResourceLoadPriority loadPriority(Resource::Type type, const FetchRequest& request)
|
| {
|
| - if (request.priority() != ResourceLoadPriorityUnresolved)
|
| - return request.priority();
|
| + if (request.resourceRequest().priority() != ResourceLoadPriorityUnresolved)
|
| + return request.resourceRequest().priority();
|
|
|
| switch (type) {
|
| case Resource::MainResource:
|
| @@ -672,7 +672,7 @@ ResourcePtr<Resource> ResourceFetcher::requestResource(Resource::Type type, Fetc
|
|
|
| KURL url = request.resourceRequest().url();
|
|
|
| - WTF_LOG(ResourceLoading, "ResourceFetcher::requestResource '%s', charset '%s', priority=%d, forPreload=%u, type=%s", url.elidedString().latin1().data(), request.charset().latin1().data(), request.priority(), request.forPreload(), ResourceTypeName(type));
|
| + WTF_LOG(ResourceLoading, "ResourceFetcher::requestResource '%s', charset '%s', priority=%d, forPreload=%u, type=%s", url.elidedString().latin1().data(), request.charset().latin1().data(), request.resourceRequest().priority(), request.forPreload(), ResourceTypeName(type));
|
|
|
| // If only the fragment identifiers differ, it is the same resource.
|
| url = MemoryCache::removeFragmentIdentifierIfNeeded(url);
|
|
|