Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(230)

Unified Diff: content/browser/renderer_host/x509_user_cert_resource_handler.cc

Issue 10392111: Use ByteStream in downloads system to decouple source and sink. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Sync'd to LKGR. Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/renderer_host/x509_user_cert_resource_handler.h ('k') | content/content_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/x509_user_cert_resource_handler.cc
diff --git a/content/browser/renderer_host/x509_user_cert_resource_handler.cc b/content/browser/renderer_host/x509_user_cert_resource_handler.cc
index 828f813d09123a8bae51fa6a38596666e4166dd2..f66fdb68160745dea3d75c5b74575dcedfdc902a 100644
--- a/content/browser/renderer_host/x509_user_cert_resource_handler.cc
+++ b/content/browser/renderer_host/x509_user_cert_resource_handler.cc
@@ -115,9 +115,26 @@ bool X509UserCertResourceHandler::OnResponseCompleted(
}
void X509UserCertResourceHandler::AssembleResource() {
- size_t assembled_bytes = 0;
- resource_buffer_ = AssembleData(buffer_, &assembled_bytes);
- DCHECK_EQ(content_length_, assembled_bytes);
+ // 0-length IOBuffers are not allowed.
+ if (content_length_ == 0) {
+ resource_buffer_ = NULL;
+ return;
+ }
+
+ // Create the new buffer.
+ resource_buffer_ = new net::IOBuffer(content_length_);
+
+ // Copy the data into it.
+ size_t bytes_copied = 0;
+ for (size_t i = 0; i < buffer_.size(); ++i) {
+ net::IOBuffer* data = buffer_[i].first;
+ size_t data_len = buffer_[i].second;
+ DCHECK(data != NULL);
+ DCHECK_LE(bytes_copied + data_len, content_length_);
+ memcpy(resource_buffer_->data() + bytes_copied, data->data(), data_len);
+ bytes_copied += data_len;
+ }
+ DCHECK_EQ(content_length_, bytes_copied);
}
} // namespace content
« no previous file with comments | « content/browser/renderer_host/x509_user_cert_resource_handler.h ('k') | content/content_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698