| Index: webkit/glue/weburlloader_impl.cc
|
| diff --git a/webkit/glue/weburlloader_impl.cc b/webkit/glue/weburlloader_impl.cc
|
| index 6182815fe8e33b6c774aa5b516f1313c41a44cbc..9f1914d3aedfcb531c5339881627647240847824 100644
|
| --- a/webkit/glue/weburlloader_impl.cc
|
| +++ b/webkit/glue/weburlloader_impl.cc
|
| @@ -294,7 +294,9 @@ class WebURLLoaderImpl::Context : public base::RefCounted<Context>,
|
| GURL* new_first_party_for_cookies);
|
| virtual void OnReceivedResponse(const ResourceResponseInfo& info);
|
| virtual void OnDownloadedData(int len);
|
| - virtual void OnReceivedData(const char* data, int len);
|
| + virtual void OnReceivedData(const char* data,
|
| + int data_length,
|
| + int length_received);
|
| virtual void OnReceivedCachedMetadata(const char* data, int len);
|
| virtual void OnCompletedRequest(const net::URLRequestStatus& status,
|
| const std::string& security_info,
|
| @@ -590,24 +592,26 @@ void WebURLLoaderImpl::Context::OnDownloadedData(int len) {
|
| client_->didDownloadData(loader_, len);
|
| }
|
|
|
| -void WebURLLoaderImpl::Context::OnReceivedData(const char* data, int len) {
|
| +void WebURLLoaderImpl::Context::OnReceivedData(const char* data,
|
| + int data_length,
|
| + int length_received) {
|
| if (!client_)
|
| return;
|
|
|
| // Temporary logging, see site_isolation_metrics.h/cc.
|
| - SiteIsolationMetrics::SniffCrossOriginHTML(response_url_, data, len);
|
| + SiteIsolationMetrics::SniffCrossOriginHTML(response_url_, data, data_length);
|
|
|
| if (ftp_listing_delegate_.get()) {
|
| // The FTP listing delegate will make the appropriate calls to
|
| // client_->didReceiveData and client_->didReceiveResponse.
|
| - ftp_listing_delegate_->OnReceivedData(data, len);
|
| + ftp_listing_delegate_->OnReceivedData(data, data_length);
|
| } else if (multipart_delegate_.get()) {
|
| // The multipart delegate will make the appropriate calls to
|
| // client_->didReceiveData and client_->didReceiveResponse.
|
| - multipart_delegate_->OnReceivedData(data, len);
|
| + multipart_delegate_->OnReceivedData(data, data_length, length_received);
|
| } else {
|
| // FIXME(vsevik): rename once renamed in webkit
|
| - client_->didReceiveData2(loader_, data, len, -1);
|
| + client_->didReceiveData2(loader_, data, data_length, length_received);
|
| }
|
| }
|
|
|
| @@ -694,7 +698,7 @@ void WebURLLoaderImpl::Context::HandleDataURL() {
|
| if (GetInfoFromDataURL(request_.url(), &info, &data, &status)) {
|
| OnReceivedResponse(info);
|
| if (!data.empty())
|
| - OnReceivedData(data.data(), data.size());
|
| + OnReceivedData(data.data(), data.size(), 0);
|
| }
|
|
|
| OnCompletedRequest(status, info.security_info, base::Time::Now());
|
|
|