| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/browser/loader/async_resource_handler.h" | 5 #include "content/browser/loader/async_resource_handler.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 16 matching lines...) Expand all Loading... |
| 27 #include "content/browser/loader/upload_progress_tracker.h" | 27 #include "content/browser/loader/upload_progress_tracker.h" |
| 28 #include "content/common/resource_messages.h" | 28 #include "content/common/resource_messages.h" |
| 29 #include "content/common/resource_request_completion_status.h" | 29 #include "content/common/resource_request_completion_status.h" |
| 30 #include "content/common/view_messages.h" | 30 #include "content/common/view_messages.h" |
| 31 #include "content/public/browser/resource_dispatcher_host_delegate.h" | 31 #include "content/public/browser/resource_dispatcher_host_delegate.h" |
| 32 #include "content/public/common/content_features.h" | 32 #include "content/public/common/content_features.h" |
| 33 #include "content/public/common/resource_response.h" | 33 #include "content/public/common/resource_response.h" |
| 34 #include "ipc/ipc_message_macros.h" | 34 #include "ipc/ipc_message_macros.h" |
| 35 #include "net/base/io_buffer.h" | 35 #include "net/base/io_buffer.h" |
| 36 #include "net/base/load_flags.h" | 36 #include "net/base/load_flags.h" |
| 37 #include "net/base/upload_progress.h" |
| 37 #include "net/url_request/redirect_info.h" | 38 #include "net/url_request/redirect_info.h" |
| 38 | 39 |
| 39 using base::TimeDelta; | 40 using base::TimeDelta; |
| 40 using base::TimeTicks; | 41 using base::TimeTicks; |
| 41 | 42 |
| 42 namespace content { | 43 namespace content { |
| 43 namespace { | 44 namespace { |
| 44 | 45 |
| 45 static int kBufferSize = 1024 * 512; | 46 static int kBufferSize = 1024 * 512; |
| 46 static int kMinAllocationSize = 1024 * 4; | 47 static int kMinAllocationSize = 1024 * 4; |
| (...skipping 499 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 546 elapsed_time, 1, 100000, 100); | 547 elapsed_time, 1, 100000, 100); |
| 547 } else { | 548 } else { |
| 548 UMA_HISTOGRAM_CUSTOM_COUNTS( | 549 UMA_HISTOGRAM_CUSTOM_COUNTS( |
| 549 "Net.ResourceLoader.ResponseStartToEnd.Over_512kB", | 550 "Net.ResourceLoader.ResponseStartToEnd.Over_512kB", |
| 550 elapsed_time, 1, 100000, 100); | 551 elapsed_time, 1, 100000, 100); |
| 551 } | 552 } |
| 552 | 553 |
| 553 inlining_helper_->RecordHistogram(elapsed_time); | 554 inlining_helper_->RecordHistogram(elapsed_time); |
| 554 } | 555 } |
| 555 | 556 |
| 556 void AsyncResourceHandler::SendUploadProgress(int64_t current_position, | 557 void AsyncResourceHandler::SendUploadProgress( |
| 557 int64_t total_size) { | 558 const net::UploadProgress& progress) { |
| 558 ResourceMessageFilter* filter = GetFilter(); | 559 ResourceMessageFilter* filter = GetFilter(); |
| 559 if (!filter) | 560 if (!filter) |
| 560 return; | 561 return; |
| 561 filter->Send(new ResourceMsg_UploadProgress( | 562 filter->Send(new ResourceMsg_UploadProgress( |
| 562 GetRequestID(), current_position, total_size)); | 563 GetRequestID(), progress.position(), progress.size())); |
| 563 } | 564 } |
| 564 | 565 |
| 565 } // namespace content | 566 } // namespace content |
| OLD | NEW |