Browser process changes for Resource Timing sizes.

content/browser/loader/async_resource_handler.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/loader/async_resource_handler.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 54 matching lines @@
   static bool did_init = false;
   if (did_init)
     return;
   did_init = true;
 
   GetNumericArg("resource-buffer-size", &kBufferSize);
   GetNumericArg("resource-buffer-min-allocation-size", &kMinAllocationSize);
   GetNumericArg("resource-buffer-max-allocation-size", &kMaxAllocationSize);
 }
 
+// Returns the value of new_length - *cached_length, also updating
+// *cached_length to new_length.

[Mike West, 2016/06/24 10:49:20]

"length" is a weird-looking word. Especially when repeated so many times in
close proximity. :)

[Adam Rice, 2016/07/07 06:50:09]

You could try filing a bug against the English language. :-)

In the meantime, I realised this function really has nothing to do with length
and so was able to make it a lot more concise.

+int CalculateLengthDifference(int64_t new_length, int64_t* cached_length) {
+  int length_difference = new_length - *cached_length;
+  *cached_length = new_length;
+  return length_difference;
+}
+
 }  // namespace
 
 // Used when kOptimizeLoadingIPCForSmallResources is enabled.
 // The instance hooks the buffer allocation of AsyncResourceHandler, and
 // determine if we should use SharedMemory or should inline the data into
 // the IPC message.
 class AsyncResourceHandler::InliningHelper {
  public:
 
   InliningHelper() {}
@@ skipping 25 matching lines @@
 
     leading_chunk_buffer_ = new net::IOBuffer(kInlinedLeadingChunkSize);
     *buf = leading_chunk_buffer_;
     *buf_size = kInlinedLeadingChunkSize;
     return true;
   }
 
   // Returns true if the received data is sent to the consumer.
   bool SendInlinedDataIfApplicable(int bytes_read,
                                    int encoded_data_length,
+                                   int encoded_body_length,
                                    IPC::Sender* sender,
                                    int request_id) {
     DCHECK(sender);
     if (!leading_chunk_buffer_)
       return false;
 
     std::vector<char> data(
         leading_chunk_buffer_->data(),
         leading_chunk_buffer_->data() + bytes_read);
     leading_chunk_buffer_ = nullptr;
 
     sender->Send(new ResourceMsg_InlinedDataChunkReceived(
-        request_id, data, encoded_data_length));
+        request_id, data, encoded_data_length, encoded_body_length));
     return true;
   }
 
   void RecordHistogram(int64_t elapsed_time) {
     if (inlining_applicable_) {
       UMA_HISTOGRAM_CUSTOM_COUNTS(
           "Net.ResourceLoader.ResponseStartToEnd.InliningApplicable",
           elapsed_time, 1, 100000, 100);
     }
   }
@@ skipping 56 matching lines @@
       rdh_(rdh),
       pending_data_count_(0),
       allocation_size_(0),
       did_defer_(false),
       has_checked_for_sufficient_resources_(false),
       sent_received_response_msg_(false),
       sent_data_buffer_msg_(false),
       inlining_helper_(new InliningHelper),
       last_upload_position_(0),
       waiting_for_upload_progress_ack_(false),
-      reported_transfer_size_(0) {
+      reported_transfer_size_(0),
+      reported_encoded_body_length_(0) {
   InitializeResourceBufferConstants();
 }
 
 AsyncResourceHandler::~AsyncResourceHandler() {
   if (has_checked_for_sufficient_resources_)
     rdh_->FinishedWithResourcesForRequest(request());
 }
 
 bool AsyncResourceHandler::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
@@ skipping 213 matching lines @@
   DCHECK_GE(bytes_read, 0);
 
   if (!bytes_read)
     return true;
 
   ResourceMessageFilter* filter = GetFilter();
   if (!filter)
     return false;
 
   int encoded_data_length = CalculateEncodedDataLengthToReport();
+  int encoded_body_length = CalculateEncodedBodyLengthToReport();
 
   // Return early if InliningHelper handled the received data.
   if (inlining_helper_->SendInlinedDataIfApplicable(
-          bytes_read, encoded_data_length, filter, GetRequestID()))
+          bytes_read, encoded_data_length, encoded_body_length, filter,
+          GetRequestID()))
     return true;
 
   buffer_->ShrinkLastAllocation(bytes_read);
 
   if (!sent_data_buffer_msg_) {
     base::SharedMemoryHandle handle = base::SharedMemory::DuplicateHandle(
         buffer_->GetSharedMemory().handle());
     if (!base::SharedMemory::IsHandleValid(handle))
       return false;
     filter->Send(new ResourceMsg_SetDataBuffer(
         GetRequestID(), handle, buffer_->GetSharedMemory().mapped_size(),
         filter->peer_pid()));
     sent_data_buffer_msg_ = true;
   }
 
   int data_offset = buffer_->GetLastAllocationOffset();
 
-  filter->Send(new ResourceMsg_DataReceived(
-      GetRequestID(), data_offset, bytes_read, encoded_data_length));
+  filter->Send(new ResourceMsg_DataReceived(GetRequestID(), data_offset,
+                                            bytes_read, encoded_data_length,
+                                            encoded_body_length));
   ++pending_data_count_;
 
   if (!buffer_->CanAllocate()) {
     *defer = did_defer_ = true;
     OnDefer();
   }
 
   return true;
 }
 
@@ skipping 93 matching lines @@
   has_checked_for_sufficient_resources_ = true;
 
   if (rdh_->HasSufficientResourcesForRequest(request()))
     return true;
 
   controller()->CancelWithError(net::ERR_INSUFFICIENT_RESOURCES);
   return false;
 }
 
 int AsyncResourceHandler::CalculateEncodedDataLengthToReport() {
-  int64_t current_transfer_size = request()->GetTotalReceivedBytes();
-  int encoded_data_length = current_transfer_size - reported_transfer_size_;
-  reported_transfer_size_ = current_transfer_size;
-  return encoded_data_length;
+  return CalculateLengthDifference(request()->GetTotalReceivedBytes(),
+                                   &reported_transfer_size_);
+}
+
+int AsyncResourceHandler::CalculateEncodedBodyLengthToReport() {
+  return CalculateLengthDifference(request()->GetRawBodyBytes(),
+                                   &reported_encoded_body_length_);
 }
 
 void AsyncResourceHandler::RecordHistogram() {
   int64_t elapsed_time =
       (base::TimeTicks::Now() - response_started_ticks_).InMicroseconds();
   int64_t encoded_length = request()->GetTotalReceivedBytes();
   if (encoded_length < 2 * 1024) {
     // The resource was smaller than the smallest required buffer size.
     UMA_HISTOGRAM_CUSTOM_COUNTS("Net.ResourceLoader.ResponseStartToEnd.LT_2kB",
                                 elapsed_time, 1, 100000, 100);
   } else if (encoded_length < 32 * 1024) {
     // The resource was smaller than single chunk.
     UMA_HISTOGRAM_CUSTOM_COUNTS("Net.ResourceLoader.ResponseStartToEnd.LT_32kB",
                                 elapsed_time, 1, 100000, 100);
   } else if (encoded_length < 512 * 1024) {
     // The resource was smaller than single chunk.
     UMA_HISTOGRAM_CUSTOM_COUNTS(
         "Net.ResourceLoader.ResponseStartToEnd.LT_512kB",
         elapsed_time, 1, 100000, 100);
   } else {
     UMA_HISTOGRAM_CUSTOM_COUNTS(
         "Net.ResourceLoader.ResponseStartToEnd.Over_512kB",
         elapsed_time, 1, 100000, 100);
   }
 
   inlining_helper_->RecordHistogram(elapsed_time);
 }
 
 }  // namespace content