summaryrefslogtreecommitdiffstats
path: root/content/child
diff options
context:
space:
mode:
authoreustas@chromium.org <eustas@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-10 12:54:57 +0000
committereustas@chromium.org <eustas@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-10 12:54:57 +0000
commitc8c56758c394793fd106f6607b50f0966976e135 (patch)
treef75a94538866b7b68dfa5a7217e61a2fdae859d5 /content/child
parentfd00e49adcf05f05a5cff215abed207e738c606c (diff)
downloadchromium_src-c8c56758c394793fd106f6607b50f0966976e135.zip
chromium_src-c8c56758c394793fd106f6607b50f0966976e135.tar.gz
chromium_src-c8c56758c394793fd106f6607b50f0966976e135.tar.bz2
Add transfer size paramater to didFinishLoading [2/3]
Mini DD: https://docs.google.com/a/chromium.org/document/d/1kAKnBKofLc3Tex_JPveubwJcQLT3BhIL3xNQyjvRIps/edit?usp=sharing Most of files contain only signature changes. There are 3 non-trivial changes: 1) ResourceMsg_RequestComplete IPC message receives struct instead of distinct parameters. 2) Use URLRequest::GetTotalReceivedBytes instead of DevToolsNetLogObserver::GetAndResetEncodedDataLength 3) Remove unused code in DevToolsNetLogObserver. BUG=111052 Review URL: https://codereview.chromium.org/143263002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@250069 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/child')
-rw-r--r--content/child/npapi/plugin_url_fetcher.cc3
-rw-r--r--content/child/npapi/plugin_url_fetcher.h3
-rw-r--r--content/child/resource_dispatcher.cc3
-rw-r--r--content/child/resource_dispatcher_unittest.cc9
4 files changed, 12 insertions, 6 deletions
diff --git a/content/child/npapi/plugin_url_fetcher.cc b/content/child/npapi/plugin_url_fetcher.cc
index fa85dd6..7359041 100644
--- a/content/child/npapi/plugin_url_fetcher.cc
+++ b/content/child/npapi/plugin_url_fetcher.cc
@@ -343,7 +343,8 @@ void PluginURLFetcher::OnCompletedRequest(
bool was_ignored_by_handler,
bool stale_copy_in_cache,
const std::string& security_info,
- const base::TimeTicks& completion_time) {
+ const base::TimeTicks& completion_time,
+ int64 total_transfer_size) {
if (multipart_delegate_) {
multipart_delegate_->OnCompletedRequest();
multipart_delegate_.reset();
diff --git a/content/child/npapi/plugin_url_fetcher.h b/content/child/npapi/plugin_url_fetcher.h
index cf58813..4e5e2ff 100644
--- a/content/child/npapi/plugin_url_fetcher.h
+++ b/content/child/npapi/plugin_url_fetcher.h
@@ -64,7 +64,8 @@ class PluginURLFetcher : public webkit_glue::ResourceLoaderBridge::Peer {
bool was_ignored_by_handler,
bool stale_copy_in_cache,
const std::string& security_info,
- const base::TimeTicks& completion_time) OVERRIDE;
+ const base::TimeTicks& completion_time,
+ int64 total_transfer_size) OVERRIDE;
PluginStreamUrl* plugin_stream_;
GURL url_;
diff --git a/content/child/resource_dispatcher.cc b/content/child/resource_dispatcher.cc
index d6affbb..c8f0021 100644
--- a/content/child/resource_dispatcher.cc
+++ b/content/child/resource_dispatcher.cc
@@ -552,7 +552,8 @@ void ResourceDispatcher::OnRequestComplete(
request_complete_data.was_ignored_by_handler,
request_complete_data.exists_in_cache,
request_complete_data.security_info,
- renderer_completion_time);
+ renderer_completion_time,
+ request_complete_data.encoded_data_length);
}
int ResourceDispatcher::AddPendingRequest(
diff --git a/content/child/resource_dispatcher_unittest.cc b/content/child/resource_dispatcher_unittest.cc
index 7ff9ac3..6452575 100644
--- a/content/child/resource_dispatcher_unittest.cc
+++ b/content/child/resource_dispatcher_unittest.cc
@@ -72,7 +72,8 @@ class TestRequestCallback : public ResourceLoaderBridge::Peer {
bool was_ignored_by_handler,
bool stale_copy_in_cache,
const std::string& security_info,
- const base::TimeTicks& completion_time) OVERRIDE {
+ const base::TimeTicks& completion_time,
+ int64 total_transfer_size) OVERRIDE {
EXPECT_FALSE(complete_);
complete_ = true;
}
@@ -298,7 +299,8 @@ class DeferredResourceLoadingTest : public ResourceDispatcherTest,
bool was_ignored_by_handler,
bool stale_copy_in_cache,
const std::string& security_info,
- const base::TimeTicks& completion_time) OVERRIDE {
+ const base::TimeTicks& completion_time,
+ int64 total_transfer_size) OVERRIDE {
}
protected:
@@ -386,7 +388,8 @@ class TimeConversionTest : public ResourceDispatcherTest,
bool was_ignored_by_handler,
bool stale_copy_in_cache,
const std::string& security_info,
- const base::TimeTicks& completion_time) OVERRIDE {
+ const base::TimeTicks& completion_time,
+ int64 total_transfer_size) OVERRIDE {
}
const ResourceResponseInfo& response_info() const { return response_info_; }