| Index: storage/browser/fileapi/local_file_stream_writer.cc
|
| diff --git a/webkit/browser/fileapi/local_file_stream_writer.cc b/storage/browser/fileapi/local_file_stream_writer.cc
|
| similarity index 85%
|
| rename from webkit/browser/fileapi/local_file_stream_writer.cc
|
| rename to storage/browser/fileapi/local_file_stream_writer.cc
|
| index 508cc50b4f4064ad81522ac634aadb6976b8601f..ca7769075e28f2418cff7f6dc9f49c98d9aa8a94 100644
|
| --- a/webkit/browser/fileapi/local_file_stream_writer.cc
|
| +++ b/storage/browser/fileapi/local_file_stream_writer.cc
|
| @@ -2,7 +2,7 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "webkit/browser/fileapi/local_file_stream_writer.h"
|
| +#include "storage/browser/fileapi/local_file_stream_writer.h"
|
|
|
| #include "base/callback.h"
|
| #include "base/message_loop/message_loop.h"
|
| @@ -10,16 +10,14 @@
|
| #include "net/base/io_buffer.h"
|
| #include "net/base/net_errors.h"
|
|
|
| -namespace fileapi {
|
| +namespace storage {
|
|
|
| namespace {
|
|
|
| -const int kOpenFlagsForWrite = base::File::FLAG_OPEN |
|
| - base::File::FLAG_WRITE |
|
| - base::File::FLAG_ASYNC;
|
| -const int kCreateFlagsForWrite = base::File::FLAG_CREATE |
|
| - base::File::FLAG_WRITE |
|
| - base::File::FLAG_ASYNC;
|
| +const int kOpenFlagsForWrite =
|
| + base::File::FLAG_OPEN | base::File::FLAG_WRITE | base::File::FLAG_ASYNC;
|
| +const int kCreateFlagsForWrite =
|
| + base::File::FLAG_CREATE | base::File::FLAG_WRITE | base::File::FLAG_ASYNC;
|
|
|
| } // namespace
|
|
|
| @@ -42,7 +40,8 @@ LocalFileStreamWriter::~LocalFileStreamWriter() {
|
| // by its Open() method.
|
| }
|
|
|
| -int LocalFileStreamWriter::Write(net::IOBuffer* buf, int buf_len,
|
| +int LocalFileStreamWriter::Write(net::IOBuffer* buf,
|
| + int buf_len,
|
| const net::CompletionCallback& callback) {
|
| DCHECK(!has_pending_operation_);
|
| DCHECK(cancel_callback_.is_null());
|
| @@ -57,7 +56,9 @@ int LocalFileStreamWriter::Write(net::IOBuffer* buf, int buf_len,
|
| return InitiateOpen(callback,
|
| base::Bind(&LocalFileStreamWriter::ReadyToWrite,
|
| weak_factory_.GetWeakPtr(),
|
| - make_scoped_refptr(buf), buf_len, callback));
|
| + make_scoped_refptr(buf),
|
| + buf_len,
|
| + callback));
|
| }
|
|
|
| int LocalFileStreamWriter::Cancel(const net::CompletionCallback& callback) {
|
| @@ -93,7 +94,8 @@ LocalFileStreamWriter::LocalFileStreamWriter(base::TaskRunner* task_runner,
|
| initial_offset_(initial_offset),
|
| task_runner_(task_runner),
|
| has_pending_operation_(false),
|
| - weak_factory_(this) {}
|
| + weak_factory_(this) {
|
| +}
|
|
|
| int LocalFileStreamWriter::InitiateOpen(
|
| const net::CompletionCallback& error_callback,
|
| @@ -105,12 +107,12 @@ int LocalFileStreamWriter::InitiateOpen(
|
|
|
| int open_flags = 0;
|
| switch (open_or_create_) {
|
| - case OPEN_EXISTING_FILE:
|
| - open_flags = kOpenFlagsForWrite;
|
| - break;
|
| - case CREATE_NEW_FILE:
|
| - open_flags = kCreateFlagsForWrite;
|
| - break;
|
| + case OPEN_EXISTING_FILE:
|
| + open_flags = kOpenFlagsForWrite;
|
| + break;
|
| + case CREATE_NEW_FILE:
|
| + open_flags = kCreateFlagsForWrite;
|
| + break;
|
| }
|
|
|
| return stream_impl_->Open(file_path_,
|
| @@ -153,7 +155,8 @@ void LocalFileStreamWriter::InitiateSeek(
|
| return;
|
| }
|
|
|
| - int result = stream_impl_->Seek(base::File::FROM_BEGIN, initial_offset_,
|
| + int result = stream_impl_->Seek(base::File::FROM_BEGIN,
|
| + initial_offset_,
|
| base::Bind(&LocalFileStreamWriter::DidSeek,
|
| weak_factory_.GetWeakPtr(),
|
| error_callback,
|
| @@ -188,7 +191,8 @@ void LocalFileStreamWriter::DidSeek(
|
| }
|
|
|
| void LocalFileStreamWriter::ReadyToWrite(
|
| - net::IOBuffer* buf, int buf_len,
|
| + net::IOBuffer* buf,
|
| + int buf_len,
|
| const net::CompletionCallback& callback) {
|
| DCHECK(has_pending_operation_);
|
|
|
| @@ -200,12 +204,14 @@ void LocalFileStreamWriter::ReadyToWrite(
|
| }
|
|
|
| int LocalFileStreamWriter::InitiateWrite(
|
| - net::IOBuffer* buf, int buf_len,
|
| + net::IOBuffer* buf,
|
| + int buf_len,
|
| const net::CompletionCallback& callback) {
|
| DCHECK(has_pending_operation_);
|
| DCHECK(stream_impl_.get());
|
|
|
| - return stream_impl_->Write(buf, buf_len,
|
| + return stream_impl_->Write(buf,
|
| + buf_len,
|
| base::Bind(&LocalFileStreamWriter::DidWrite,
|
| weak_factory_.GetWeakPtr(),
|
| callback));
|
| @@ -226,9 +232,8 @@ int LocalFileStreamWriter::InitiateFlush(
|
| DCHECK(has_pending_operation_);
|
| DCHECK(stream_impl_.get());
|
|
|
| - return stream_impl_->Flush(base::Bind(&LocalFileStreamWriter::DidFlush,
|
| - weak_factory_.GetWeakPtr(),
|
| - callback));
|
| + return stream_impl_->Flush(base::Bind(
|
| + &LocalFileStreamWriter::DidFlush, weak_factory_.GetWeakPtr(), callback));
|
| }
|
|
|
| void LocalFileStreamWriter::DidFlush(const net::CompletionCallback& callback,
|
| @@ -254,4 +259,4 @@ bool LocalFileStreamWriter::CancelIfRequested() {
|
| return true;
|
| }
|
|
|
| -} // namespace fileapi
|
| +} // namespace storage
|
|
|