diff options
| author | satorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-10 07:39:11 +0000 |
|---|---|---|
| committer | satorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-10 07:39:11 +0000 |
| commit | 1dce708bbe7fdef15436e20f36f805f53bfdcb73 (patch) | |
| tree | 3b7852c44e541e6d755fb1044c857d37bc622252 /webkit/tools | |
| parent | 9caded3f4f06300155f117134f59b5d85b98119f (diff) | |
| download | chromium_src-1dce708bbe7fdef15436e20f36f805f53bfdcb73.zip chromium_src-1dce708bbe7fdef15436e20f36f805f53bfdcb73.tar.gz chromium_src-1dce708bbe7fdef15436e20f36f805f53bfdcb73.tar.bz2 | |
net: Make UploadData::GetContentLength() asynchronous.
However, the asynchronous version is not used yet.
The synchronous version is kept as GetContentLengthSync().
The existing code is changed to use the synchronous version.
TEST=net_unittests
BUG=72001,112607
Review URL: https://chromiumcodereview.appspot.com/9321003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@121411 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools')
| -rw-r--r-- | webkit/tools/test_shell/simple_resource_loader_bridge.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/webkit/tools/test_shell/simple_resource_loader_bridge.cc b/webkit/tools/test_shell/simple_resource_loader_bridge.cc index 8f76c2b..cd29965 100644 --- a/webkit/tools/test_shell/simple_resource_loader_bridge.cc +++ b/webkit/tools/test_shell/simple_resource_loader_bridge.cc @@ -534,7 +534,9 @@ class RequestProxy : public net::URLRequest::Delegate, return; } - uint64 size = request_->get_upload()->GetContentLength(); + // GetContentLengthSync() may perform file IO, but it's ok here, as file + // IO is not prohibited in IOThread defined in the file. + uint64 size = request_->get_upload()->GetContentLengthSync(); uint64 position = request_->GetUploadProgress(); if (position == last_upload_position_) return; // no progress made since last time |