Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(887)

Unified Diff: third_party/WebKit/Source/core/fetch/ResourceLoader.cpp

Issue 2537753002: Remove WebURLLoader* argument from WebURLLoaderClient methods (Closed)
Patch Set: a Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/fetch/ResourceLoader.cpp
diff --git a/third_party/WebKit/Source/core/fetch/ResourceLoader.cpp b/third_party/WebKit/Source/core/fetch/ResourceLoader.cpp
index a83cd453053d88060185af201bb7af19a8ec27f8..00d409da056ce8916909b15e780885b73c353980 100644
--- a/third_party/WebKit/Source/core/fetch/ResourceLoader.cpp
+++ b/third_party/WebKit/Source/core/fetch/ResourceLoader.cpp
@@ -116,9 +116,7 @@ void ResourceLoader::setDefersLoading(bool defers) {
m_loader->setDefersLoading(defers);
}
-void ResourceLoader::didDownloadData(WebURLLoader*,
- int length,
- int encodedDataLength) {
+void ResourceLoader::didDownloadData(int length, int encodedDataLength) {
m_fetcher->didDownloadData(m_resource.get(), length, encodedDataLength);
m_resource->didDownloadData(length);
}
@@ -144,7 +142,6 @@ void ResourceLoader::cancelForRedirectAccessCheckError(const KURL& newURL) {
}
bool ResourceLoader::willFollowRedirect(
- WebURLLoader*,
WebURLRequest& passedNewRequest,
const WebURLResponse& passedRedirectResponse) {
DCHECK(!passedNewRequest.isNull());
@@ -190,20 +187,16 @@ bool ResourceLoader::willFollowRedirect(
return true;
}
-void ResourceLoader::didReceiveCachedMetadata(WebURLLoader*,
- const char* data,
- int length) {
+void ResourceLoader::didReceiveCachedMetadata(const char* data, int length) {
m_resource->setSerializedCachedMetadata(data, length);
}
-void ResourceLoader::didSendData(WebURLLoader*,
- unsigned long long bytesSent,
+void ResourceLoader::didSendData(unsigned long long bytesSent,
unsigned long long totalBytesToBeSent) {
m_resource->didSendData(bytesSent, totalBytesToBeSent);
}
void ResourceLoader::didReceiveResponse(
- WebURLLoader*,
const WebURLResponse& response,
std::unique_ptr<WebDataConsumerHandle> handle) {
DCHECK(!response.isNull());
@@ -211,13 +204,11 @@ void ResourceLoader::didReceiveResponse(
std::move(handle));
}
-void ResourceLoader::didReceiveResponse(WebURLLoader* loader,
- const WebURLResponse& response) {
- didReceiveResponse(loader, response, nullptr);
+void ResourceLoader::didReceiveResponse(const WebURLResponse& response) {
+ didReceiveResponse(response, nullptr);
}
-void ResourceLoader::didReceiveData(WebURLLoader*,
- const char* data,
+void ResourceLoader::didReceiveData(const char* data,
int length,
int encodedDataLength) {
CHECK_GE(length, 0);
@@ -231,8 +222,7 @@ void ResourceLoader::didFinishLoadingFirstPartInMultipart() {
ResourceFetcher::DidFinishFirstPartInMultipart);
}
-void ResourceLoader::didFinishLoading(WebURLLoader*,
- double finishTime,
+void ResourceLoader::didFinishLoading(double finishTime,
int64_t encodedDataLength,
int64_t encodedBodyLength) {
m_resource->setEncodedDataLength(encodedDataLength);
@@ -242,8 +232,7 @@ void ResourceLoader::didFinishLoading(WebURLLoader*,
ResourceFetcher::DidFinishLoading);
}
-void ResourceLoader::didFail(WebURLLoader*,
- const WebURLError& error,
+void ResourceLoader::didFail(const WebURLError& error,
int64_t encodedDataLength,
int64_t encodedBodyLength) {
m_resource->setEncodedDataLength(encodedDataLength);
@@ -286,10 +275,10 @@ void ResourceLoader::requestSynchronously(const ResourceRequest& request) {
if (!m_loader)
return;
if (errorOut.reason) {
- didFail(0, errorOut, encodedDataLength, encodedBodyLength);
+ didFail(errorOut, encodedDataLength, encodedBodyLength);
return;
}
- didReceiveResponse(0, responseOut);
+ didReceiveResponse(responseOut);
if (!m_loader)
return;
DCHECK_GE(responseOut.toResourceResponse().encodedBodyLength(), 0);
@@ -303,7 +292,7 @@ void ResourceLoader::requestSynchronously(const ResourceRequest& request) {
encodedDataLength);
m_resource->setResourceBuffer(dataOut);
}
- didFinishLoading(0, monotonicallyIncreasingTime(), encodedDataLength,
+ didFinishLoading(monotonicallyIncreasingTime(), encodedDataLength,
encodedBodyLength);
}
« no previous file with comments | « third_party/WebKit/Source/core/fetch/ResourceLoader.h ('k') | third_party/WebKit/Source/core/loader/PingLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698