Commit afca50d5 authored by mkwst@chromium.org's avatar mkwst@chromium.org

Split out const/non-const variants of Resource::resourceRequest().

This patch follows the general convention of *::resourceRequest() and
*::mutableResourceRequest() from various other classes which use
ResourceRequest objects (FetchRequest, NavigationAction, etc).

As a drive-by, it also consts Resource::lastResourceRequest(), which was
already returning a const reference.

NOTRY=true

Review URL: https://codereview.chromium.org/424083002

git-svn-id: svn://svn.chromium.org/blink/trunk@179143 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 8d377347
...@@ -350,7 +350,7 @@ static bool canUseResponse(ResourceResponse& response, double responseTimestamp) ...@@ -350,7 +350,7 @@ static bool canUseResponse(ResourceResponse& response, double responseTimestamp)
return currentAge(response, responseTimestamp) <= freshnessLifetime(response, responseTimestamp); return currentAge(response, responseTimestamp) <= freshnessLifetime(response, responseTimestamp);
} }
const ResourceRequest& Resource::lastResourceRequest() const ResourceRequest& Resource::lastResourceRequest() const
{ {
if (!m_redirectChain.size()) if (!m_redirectChain.size())
return m_resourceRequest; return m_resourceRequest;
......
...@@ -111,8 +111,10 @@ public: ...@@ -111,8 +111,10 @@ public:
virtual bool shouldIgnoreHTTPStatusCodeErrors() const { return false; } virtual bool shouldIgnoreHTTPStatusCodeErrors() const { return false; }
ResourceRequest& resourceRequest() { return m_resourceRequest; } ResourceRequest& mutableResourceRequest() { return m_resourceRequest; }
const ResourceRequest& lastResourceRequest(); const ResourceRequest& resourceRequest() const { return m_resourceRequest; }
const ResourceRequest& lastResourceRequest() const;
const KURL& url() const { return m_resourceRequest.url();} const KURL& url() const { return m_resourceRequest.url();}
Type type() const { return static_cast<Type>(m_type); } Type type() const { return static_cast<Type>(m_type); }
const ResourceLoaderOptions& options() const { return m_options; } const ResourceLoaderOptions& options() const { return m_options; }
......
...@@ -751,7 +751,7 @@ ResourcePtr<Resource> ResourceFetcher::requestResource(Resource::Type type, Fetc ...@@ -751,7 +751,7 @@ ResourcePtr<Resource> ResourceFetcher::requestResource(Resource::Type type, Fetc
if (!request.forPreload() || policy != Use) { if (!request.forPreload() || policy != Use) {
ResourceLoadPriority priority = loadPriority(type, request); ResourceLoadPriority priority = loadPriority(type, request);
if (priority != resource->resourceRequest().priority()) { if (priority != resource->resourceRequest().priority()) {
resource->resourceRequest().setPriority(priority); resource->mutableResourceRequest().setPriority(priority);
resource->didChangePriority(priority, 0); resource->didChangePriority(priority, 0);
} }
} }
......
...@@ -101,7 +101,7 @@ void ResourceLoadPriorityOptimizer::updateImageResourcesWithLoadPriority() ...@@ -101,7 +101,7 @@ void ResourceLoadPriorityOptimizer::updateImageResourcesWithLoadPriority()
ResourceLoadPriorityLow : ResourceLoadPriorityVeryLow; ResourceLoadPriorityLow : ResourceLoadPriorityVeryLow;
if (priority != it->value->imageResource->resourceRequest().priority()) { if (priority != it->value->imageResource->resourceRequest().priority()) {
it->value->imageResource->resourceRequest().setPriority(priority, it->value->screenArea); it->value->imageResource->mutableResourceRequest().setPriority(priority, it->value->screenArea);
it->value->imageResource->didChangePriority(priority, it->value->screenArea); it->value->imageResource->didChangePriority(priority, it->value->screenArea);
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment