net: Return size of upload as well as position from URLRequest::GetUploadProgress()

content/browser/renderer_host/resource_loader.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.
 
 #include "content/browser/renderer_host/resource_loader.h"
 
 #include "base/message_loop.h"
 #include "base/time.h"
 #include "content/browser/child_process_security_policy_impl.h"
 #include "content/browser/renderer_host/doomed_resource_handler.h"
@@ skipping 89 matching lines @@
 void ResourceLoader::CancelRequest(bool from_renderer) {
   CancelRequestInternal(net::ERR_ABORTED, from_renderer);
 }
 
 void ResourceLoader::ReportUploadProgress() {
   ResourceRequestInfoImpl* info = GetRequestInfo();
 
   if (waiting_for_upload_progress_ack_)
     return;  // Send one progress event at a time.
 
-  uint64 size = info->GetUploadSize();
-  if (!size)
+  const net::UploadProgress progress = request_->GetUploadProgress();
+  if (!progress.size)
     return;  // Nothing to upload.
 
-  uint64 position = request_->GetUploadProgress();
-  if (position == last_upload_position_)
+  if (progress.position == last_upload_position_)
     return;  // No progress made since last time.
 
   const uint64 kHalfPercentIncrements = 200;
   const TimeDelta kOneSecond = TimeDelta::FromMilliseconds(1000);
 
-  uint64 amt_since_last = position - last_upload_position_;
+  uint64 amt_since_last = progress.position - last_upload_position_;
   TimeDelta time_since_last = TimeTicks::Now() - last_upload_ticks_;
 
-  bool is_finished = (size == position);
-  bool enough_new_progress = (amt_since_last > (size / kHalfPercentIncrements));
+  bool is_finished = (progress.size == progress.position);
+  bool enough_new_progress =
+      (amt_since_last > (progress.size / kHalfPercentIncrements));
   bool too_much_time_passed = time_since_last > kOneSecond;
 
   if (is_finished || enough_new_progress || too_much_time_passed) {
     if (request_->load_flags() & net::LOAD_ENABLE_UPLOAD_PROGRESS) {
-      handler_->OnUploadProgress(info->GetRequestID(), position, size);
+      handler_->OnUploadProgress(
+          info->GetRequestID(), progress.position, progress.size);
       waiting_for_upload_progress_ack_ = true;
     }
     last_upload_ticks_ = TimeTicks::Now();
-    last_upload_position_ = position;
+    last_upload_position_ = progress.position;
   }
 }
 
 void ResourceLoader::MarkAsTransferring() {
   is_transferring_ = true;
 
   // When an URLRequest is transferred to a new RenderViewHost, its
   // ResourceHandler should not receive any notifications because it may depend
   // on the state of the old RVH. We set a ResourceHandler that only allows
   // canceling requests, because on shutdown of the RDH all pending requests
@@ skipping 417 matching lines @@
     // we resume.
     deferred_stage_ = DEFERRED_FINISH;
   }
 }
 
 void ResourceLoader::CallDidFinishLoading() {
   delegate_->DidFinishLoading(this);
 }
 
 }  // namespace content