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

Unified Diff: webkit/fileapi/file_writer_delegate.cc

Issue 9402014: net: FileStream::Read/Write() to take IOBuffer* instead of char* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 8 years, 10 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
« net/base/file_stream_win.cc ('K') | « webkit/fileapi/file_writer_delegate.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/fileapi/file_writer_delegate.cc
diff --git a/webkit/fileapi/file_writer_delegate.cc b/webkit/fileapi/file_writer_delegate.cc
index 3733b1bd89fb259d253bc1846a49e53d3c0d045b..4aafb885f0715625f0e3615610e26f79d68f5fbf 100644
--- a/webkit/fileapi/file_writer_delegate.cc
+++ b/webkit/fileapi/file_writer_delegate.cc
@@ -195,7 +195,8 @@ void FileWriterDelegate::OnReadCompleted(net::URLRequest* request,
void FileWriterDelegate::Read() {
bytes_written_ = 0;
bytes_read_ = 0;
- if (request_->Read(io_buffer_.get(), io_buffer_->size(), &bytes_read_)) {
+ if (request_->Read(io_buffer_.get(), io_buffer_->size(),
+ &bytes_read_)) {
MessageLoop::current()->PostTask(
FROM_HERE,
base::Bind(&FileWriterDelegate::OnDataReceived,
@@ -213,6 +214,7 @@ void FileWriterDelegate::OnDataReceived(int bytes_read) {
// This could easily be optimized to rotate between a pool of buffers, so
// that we could read and write at the same time. It's not yet clear that
// it's necessary.
+ cursor_ = new net::DrainableIOBuffer(io_buffer_, bytes_read_);
Write();
}
}
@@ -234,7 +236,7 @@ void FileWriterDelegate::Write() {
bytes_to_write = allowed_bytes_to_write_ - total_bytes_written_;
int write_response =
- file_stream_->Write(io_buffer_->data() + bytes_written_,
+ file_stream_->Write(cursor_,
static_cast<int>(bytes_to_write),
base::Bind(&FileWriterDelegate::OnDataWritten,
base::Unretained(this)));
@@ -250,6 +252,7 @@ void FileWriterDelegate::Write() {
void FileWriterDelegate::OnDataWritten(int write_response) {
if (write_response > 0) {
OnProgress(write_response, false);
+ cursor_->DidConsume(write_response);
bytes_written_ += write_response;
total_bytes_written_ += write_response;
if (bytes_written_ == bytes_read_)
« net/base/file_stream_win.cc ('K') | « webkit/fileapi/file_writer_delegate.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698