| Index: content/child/web_url_loader_impl.cc
|
| diff --git a/content/child/web_url_loader_impl.cc b/content/child/web_url_loader_impl.cc
|
| index 80741405a603c8aa25d3e9c085b4b2d7bac65033..cb74cd184c5de2fc8c08daa5229204bd8a1e55c7 100644
|
| --- a/content/child/web_url_loader_impl.cc
|
| +++ b/content/child/web_url_loader_impl.cc
|
| @@ -584,7 +584,8 @@ bool WebURLLoaderImpl::Context::OnReceivedRedirect(
|
| !info.was_fetched_via_service_worker,
|
| &new_request);
|
|
|
| - client_->willFollowRedirect(loader_, new_request, response);
|
| + client_->willFollowRedirect(loader_, new_request, response,
|
| + info.encoded_data_length);
|
| request_ = new_request;
|
|
|
| // Only follow the redirect if WebKit left the URL unmodified.
|
| @@ -714,7 +715,8 @@ void WebURLLoaderImpl::Context::OnReceivedData(
|
| } else {
|
| // We dispatch the data even when |useStreamOnResponse()| is set, in order
|
| // to make Devtools work.
|
| - client_->didReceiveData(loader_, payload, data_length, encoded_data_length);
|
| + client_->didReceiveData(loader_, payload, data_length, encoded_data_length,
|
| + data->encoded_body_length());
|
|
|
| if (request_.useStreamOnResponse()) {
|
| // We don't support ftp_listening_delegate_ for now.
|
| @@ -853,9 +855,10 @@ void WebURLLoaderImpl::Context::HandleDataURL() {
|
|
|
| if (error_code == net::OK) {
|
| OnReceivedResponse(info);
|
| - if (!data.empty())
|
| + auto size = data.size();
|
| + if (size != 0)
|
| OnReceivedData(
|
| - base::WrapUnique(new FixedReceivedData(data.data(), data.size(), 0)));
|
| + base::WrapUnique(new FixedReceivedData(data.data(), size, 0, size)));
|
| }
|
|
|
| OnCompletedRequest(error_code, false, false, info.security_info,
|
|
|