diff options
| author | jcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-12 19:54:57 +0000 |
|---|---|---|
| committer | jcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-12 19:54:57 +0000 |
| commit | 89c7ed00c4d37c0b917d4a681d94d6a4ce782c33 (patch) | |
| tree | a5fe16a1fcbed0acb5a111830fc7d2b3c4ca8fba /chrome | |
| parent | 4a66920f66fe2c5db40f4e8c0efa9cb5d7bebfcb (diff) | |
| download | chromium_src-89c7ed00c4d37c0b917d4a681d94d6a4ce782c33.zip chromium_src-89c7ed00c4d37c0b917d4a681d94d6a4ce782c33.tar.gz chromium_src-89c7ed00c4d37c0b917d4a681d94d6a4ce782c33.tar.bz2 | |
WebKit resource requests now have a flag reportUploadProgress that tells us whether we should turn on the reporting of upload progress updates.
This CL adds plumbing in the SimpleResourceLoader for reporting upload progress updates, as is already done in ResourceDispatcherHost.
This makes 3 layout tests (XMLHttpRequest related) pass.
BUG=None
TEST=Run the layout tests.
Review URL: http://codereview.chromium.org/28341
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11567 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/common/resource_dispatcher_unittest.cc | 3 | ||||
| -rw-r--r-- | chrome/common/security_filter_peer.cc | 4 | ||||
| -rw-r--r-- | chrome/common/security_filter_peer.h | 1 |
3 files changed, 8 insertions, 0 deletions
diff --git a/chrome/common/resource_dispatcher_unittest.cc b/chrome/common/resource_dispatcher_unittest.cc index 0370bde..a3eea69 100644 --- a/chrome/common/resource_dispatcher_unittest.cc +++ b/chrome/common/resource_dispatcher_unittest.cc @@ -44,6 +44,9 @@ class TestRequestCallback : public ResourceLoaderBridge::Peer { data_.append(data, len); } + virtual void OnUploadProgress(uint64 position, uint64 size) { + } + virtual void OnCompletedRequest(const URLRequestStatus& status, const std::string& security_info) { EXPECT_FALSE(complete_); diff --git a/chrome/common/security_filter_peer.cc b/chrome/common/security_filter_peer.cc index cfe8919..e3c5cf0 100644 --- a/chrome/common/security_filter_peer.cc +++ b/chrome/common/security_filter_peer.cc @@ -100,6 +100,10 @@ SecurityFilterPeer* SecurityFilterPeer::CreateSecurityFilterPeerForFrame( return new ReplaceContentPeer(NULL, peer, "text/html", html); } +void SecurityFilterPeer::OnUploadProgress(uint64 position, uint64 size) { + original_peer_->OnUploadProgress(position, size); +} + void SecurityFilterPeer::OnReceivedRedirect(const GURL& new_url) { NOTREACHED(); } diff --git a/chrome/common/security_filter_peer.h b/chrome/common/security_filter_peer.h index 6eaf612..ec90bb5 100644 --- a/chrome/common/security_filter_peer.h +++ b/chrome/common/security_filter_peer.h @@ -38,6 +38,7 @@ class SecurityFilterPeer : public webkit_glue::ResourceLoaderBridge::Peer { int os_error); // ResourceLoaderBridge::Peer methods. + virtual void OnUploadProgress(uint64 position, uint64 size); virtual void OnReceivedRedirect(const GURL& new_url); virtual void OnReceivedResponse( const webkit_glue::ResourceLoaderBridge::ResponseInfo& info, |