Implement upload progress handling in Mojo loading

content/child/resource_dispatcher.cc

 // Copyright (c) 2012 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.
 
 // See http://dev.chromium.org/developers/design-documents/multi-process-resource-loading
 
 #include "content/child/resource_dispatcher.h"
 
 #include <utility>
 
@@ skipping 96 matching lines @@
     DCHECK(!body_consumer_);
     resource_dispatcher_->OnMessageReceived(ResourceMsg_ReceivedRedirect(
         request_id_, redirect_info, response_head));
   }
 
   void OnDataDownloaded(int64_t data_len, int64_t encoded_data_len) override {
     resource_dispatcher_->OnMessageReceived(
         ResourceMsg_DataDownloaded(request_id_, data_len, encoded_data_len));
   }
 
+  void OnUploadProgress(int64_t current_position,
+                        int64_t total_size,
+                        const base::Closure& ack_callback) override {
+    resource_dispatcher_->OnMessageReceived(
+        ResourceMsg_UploadProgress(request_id_, current_position, total_size));
+    ack_callback.Run();
+  }
+
   void OnStartLoadingResponseBody(
       mojo::ScopedDataPipeConsumerHandle body) override {
     DCHECK(!body_consumer_);
     body_consumer_ = new URLResponseBodyConsumer(
         request_id_, resource_dispatcher_, std::move(body), task_runner_);
     if (has_received_response_)
       body_consumer_->Start();
   }
 
   void OnComplete(const ResourceRequestCompletionStatus& status) override {
@@ skipping 96 matching lines @@
 
 void ResourceDispatcher::OnUploadProgress(int request_id,
                                           int64_t position,
                                           int64_t size) {
   PendingRequestInfo* request_info = GetPendingRequestInfo(request_id);
   if (!request_info)
     return;
 
   request_info->peer->OnUploadProgress(position, size);
 
-  // Acknowledge receipt
-  message_sender_->Send(new ResourceHostMsg_UploadProgress_ACK(request_id));
+  if (!request_info->url_loader) {

[yhirano, 2016/12/16 08:47:56]

Please leave some comments here.

[tzik, 2017/01/05 05:14:33]

Done.

+    // Acknowledge receipt
+    message_sender_->Send(new ResourceHostMsg_UploadProgress_ACK(request_id));
+  }
 }
 
 void ResourceDispatcher::OnReceivedResponse(
     int request_id, const ResourceResponseHead& response_head) {
   TRACE_EVENT0("loader", "ResourceDispatcher::OnReceivedResponse");
   PendingRequestInfo* request_info = GetPendingRequestInfo(request_id);
   if (!request_info)
     return;
   request_info->response_start = ConsumeIOTimestamp();
 
@@ skipping 616 matching lines @@
     delete message;
   }
 }
 
 void ResourceDispatcher::SetResourceSchedulingFilter(
     scoped_refptr<ResourceSchedulingFilter> resource_scheduling_filter) {
   resource_scheduling_filter_ = resource_scheduling_filter;
 }
 
 }  // namespace content