Send the decoded size when response completed and stop summing in ResourceLoader::DidReceiveData()

content/child/web_url_loader_impl.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/child/web_url_loader_impl.h"
 
 #include <stdint.h>
 
 #include <algorithm>
 #include <memory>
@@ skipping 368 matching lines @@
   void OnReceivedResponse(const ResourceResponseInfo& info);
   void OnDownloadedData(int len, int encoded_data_length);
   void OnReceivedData(std::unique_ptr<ReceivedData> data);
   void OnTransferSizeUpdated(int transfer_size_diff);
   void OnReceivedCachedMetadata(const char* data, int len);
   void OnCompletedRequest(int error_code,
                           bool was_ignored_by_handler,
                           bool stale_copy_in_cache,
                           const base::TimeTicks& completion_time,
                           int64_t total_transfer_size,
-                          int64_t encoded_body_size);
+                          int64_t encoded_body_size,
+                          int64_t decoded_body_size);
 
  private:
   friend class base::RefCounted<Context>;
   ~Context();
 
   // Called when the body data stream is detached from the reader side.
   void CancelBodyStreaming();
   // We can optimize the handling of data URLs in most cases.
   bool CanHandleDataURLRequestLocally() const;
   void HandleDataURL();
@@ skipping 28 matching lines @@
   void OnReceivedResponse(const ResourceResponseInfo& info) override;
   void OnDownloadedData(int len, int encoded_data_length) override;
   void OnReceivedData(std::unique_ptr<ReceivedData> data) override;
   void OnTransferSizeUpdated(int transfer_size_diff) override;
   void OnReceivedCachedMetadata(const char* data, int len) override;
   void OnCompletedRequest(int error_code,
                           bool was_ignored_by_handler,
                           bool stale_copy_in_cache,
                           const base::TimeTicks& completion_time,
                           int64_t total_transfer_size,
-                          int64_t encoded_body_size) override;
+                          int64_t encoded_body_size,
+                          int64_t decoded_body_size) override;
 
  private:
   scoped_refptr<Context> context_;
   DISALLOW_COPY_AND_ASSIGN(RequestPeerImpl);
 };
 
 // WebURLLoaderImpl::Context --------------------------------------------------
 
 WebURLLoaderImpl::Context::Context(WebURLLoaderImpl* loader,
                                    ResourceDispatcher* resource_dispatcher,
@@ skipping 408 matching lines @@
       this, TRACE_EVENT_FLAG_FLOW_IN | TRACE_EVENT_FLAG_FLOW_OUT);
   client_->DidReceiveCachedMetadata(data, len);
 }
 
 void WebURLLoaderImpl::Context::OnCompletedRequest(
     int error_code,
     bool was_ignored_by_handler,
     bool stale_copy_in_cache,
     const base::TimeTicks& completion_time,
     int64_t total_transfer_size,
-    int64_t encoded_body_size) {
+    int64_t encoded_body_size,
+    int64_t decoded_body_size) {
   if (stream_override_ && stream_override_->stream_url.is_empty()) {
     // TODO(kinuko|scottmg|jam): This is wrong. https://crbug.com/705744.
     total_transfer_size = stream_override_->total_transferred;
     encoded_body_size = stream_override_->total_transferred;
   }
 
   if (ftp_listing_delegate_) {
     ftp_listing_delegate_->OnCompletedRequest();
     ftp_listing_delegate_.reset(NULL);
   }
 
   if (body_stream_writer_ && error_code != net::OK)
     body_stream_writer_->Fail();
   body_stream_writer_.reset();
 
   if (client_) {
     TRACE_EVENT_WITH_FLOW0(
         "loading", "WebURLLoaderImpl::Context::OnCompletedRequest",
         this, TRACE_EVENT_FLAG_FLOW_IN);
 
     if (error_code != net::OK) {
       client_->DidFail(CreateWebURLError(request_.Url(), stale_copy_in_cache,
                                          error_code, was_ignored_by_handler),
-                       total_transfer_size, encoded_body_size);
+                       total_transfer_size, encoded_body_size,
+                       decoded_body_size);
     } else {
       // PlzNavigate: compute the accurate transfer size for navigations.
       if (stream_override_) {
         DCHECK(IsBrowserSideNavigationEnabled());
         total_transfer_size += stream_override_->total_transfer_size_delta;
       }
 
       client_->DidFinishLoading((completion_time - TimeTicks()).InSecondsF(),
-                                total_transfer_size, encoded_body_size);
+                                total_transfer_size, encoded_body_size,
+                                decoded_body_size);
     }
   }
 }
 
 WebURLLoaderImpl::Context::~Context() {
   // We must be already cancelled at this point.
   DCHECK_LT(request_id_, 0);
 }
 
 void WebURLLoaderImpl::Context::CancelBodyStreaming() {
   scoped_refptr<Context> protect(this);
 
   // Notify renderer clients that the request is canceled.
   if (ftp_listing_delegate_) {
     ftp_listing_delegate_->OnCompletedRequest();
     ftp_listing_delegate_.reset(NULL);
   }
 
   if (body_stream_writer_) {
     body_stream_writer_->Fail();
     body_stream_writer_.reset();
   }
   if (client_) {
     // TODO(yhirano): Set |stale_copy_in_cache| appropriately if possible.
     client_->DidFail(CreateWebURLError(request_.Url(), false, net::ERR_ABORTED),
-                     WebURLLoaderClient::kUnknownEncodedDataLength, 0);
+                     WebURLLoaderClient::kUnknownEncodedDataLength, 0, 0);
   }
 
   // Notify the browser process that the request is canceled.
   Cancel();
 }
 
 bool WebURLLoaderImpl::Context::CanHandleDataURLRequestLocally() const {
   if (!request_.Url().ProtocolIs(url::kDataScheme))
     return false;
 
@@ skipping 51 matching lines @@
   int error_code = GetInfoFromDataURL(request_.Url(), &info, &data);
 
   if (error_code == net::OK) {
     OnReceivedResponse(info);
     auto size = data.size();
     if (size != 0)
       OnReceivedData(base::MakeUnique<FixedReceivedData>(data.data(), size));
   }
 
   OnCompletedRequest(error_code, false, false, base::TimeTicks::Now(), 0,
-                     data.size());
+                     data.size(), data.size());
 }
 
 // WebURLLoaderImpl::RequestPeerImpl ------------------------------------------
 
 WebURLLoaderImpl::RequestPeerImpl::RequestPeerImpl(Context* context)
     : context_(context) {}
 
 void WebURLLoaderImpl::RequestPeerImpl::OnUploadProgress(uint64_t position,
                                                          uint64_t size) {
   context_->OnUploadProgress(position, size);
@@ skipping 31 matching lines @@
     int len) {
   context_->OnReceivedCachedMetadata(data, len);
 }
 
 void WebURLLoaderImpl::RequestPeerImpl::OnCompletedRequest(
     int error_code,
     bool was_ignored_by_handler,
     bool stale_copy_in_cache,
     const base::TimeTicks& completion_time,
     int64_t total_transfer_size,
-    int64_t encoded_body_size) {
-  context_->OnCompletedRequest(error_code, was_ignored_by_handler,
-                               stale_copy_in_cache, completion_time,
-                               total_transfer_size, encoded_body_size);
+    int64_t encoded_body_size,
+    int64_t decoded_body_size) {
+  context_->OnCompletedRequest(
+      error_code, was_ignored_by_handler, stale_copy_in_cache, completion_time,
+      total_transfer_size, encoded_body_size, decoded_body_size);
 }
 
 // WebURLLoaderImpl -----------------------------------------------------------
 
 WebURLLoaderImpl::WebURLLoaderImpl(ResourceDispatcher* resource_dispatcher,
                                    mojom::URLLoaderFactory* url_loader_factory)
     : context_(new Context(this, resource_dispatcher, url_loader_factory)) {}
 
 WebURLLoaderImpl::~WebURLLoaderImpl() {
   Cancel();
@@ skipping 178 matching lines @@
   if (error_code != net::OK) {
     response.SetURL(final_url);
     error.domain = WebString::FromASCII(net::kErrorDomain);
     error.reason = error_code;
     error.unreachable_url = final_url;
     return;
   }
 
   PopulateURLResponse(final_url, sync_load_response, &response,
                       request.ReportRawHeaders());
-  response.AddToDecodedBodyLength(sync_load_response.data.size());
   encoded_data_length = sync_load_response.encoded_data_length;
   encoded_body_length = sync_load_response.encoded_body_length;
 
   data.Assign(sync_load_response.data.data(), sync_load_response.data.size());
 }
 
 void WebURLLoaderImpl::LoadAsynchronously(const WebURLRequest& request,
                                           WebURLLoaderClient* client) {
   TRACE_EVENT_WITH_FLOW0("loading", "WebURLLoaderImpl::loadAsynchronously",
                          this, TRACE_EVENT_FLAG_FLOW_OUT);
@@ skipping 15 matching lines @@
                                          int intra_priority_value) {
   context_->DidChangePriority(new_priority, intra_priority_value);
 }
 
 void WebURLLoaderImpl::SetLoadingTaskRunner(
     base::SingleThreadTaskRunner* loading_task_runner) {
   context_->SetTaskRunner(loading_task_runner);
 }
 
 }  // namespace content