Index: storage/browser/fileapi/sandbox_file_stream_writer.cc |
diff --git a/webkit/browser/fileapi/sandbox_file_stream_writer.cc b/storage/browser/fileapi/sandbox_file_stream_writer.cc |
similarity index 78% |
rename from webkit/browser/fileapi/sandbox_file_stream_writer.cc |
rename to storage/browser/fileapi/sandbox_file_stream_writer.cc |
index f5efaa634fa6c725c258c348d8c84dc769cc0903..45f3613d4d6e32eb2db6ac924a231c5ec560c150 100644 |
--- a/webkit/browser/fileapi/sandbox_file_stream_writer.cc |
+++ b/storage/browser/fileapi/sandbox_file_stream_writer.cc |
@@ -2,21 +2,21 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "webkit/browser/fileapi/sandbox_file_stream_writer.h" |
+#include "storage/browser/fileapi/sandbox_file_stream_writer.h" |
#include "base/files/file_util_proxy.h" |
#include "base/sequenced_task_runner.h" |
#include "net/base/io_buffer.h" |
#include "net/base/net_errors.h" |
-#include "webkit/browser/blob/file_stream_reader.h" |
-#include "webkit/browser/fileapi/file_observers.h" |
-#include "webkit/browser/fileapi/file_stream_writer.h" |
-#include "webkit/browser/fileapi/file_system_context.h" |
-#include "webkit/browser/fileapi/file_system_operation_runner.h" |
-#include "webkit/browser/quota/quota_manager_proxy.h" |
-#include "webkit/common/fileapi/file_system_util.h" |
+#include "storage/browser/blob/file_stream_reader.h" |
+#include "storage/browser/fileapi/file_observers.h" |
+#include "storage/browser/fileapi/file_stream_writer.h" |
+#include "storage/browser/fileapi/file_system_context.h" |
+#include "storage/browser/fileapi/file_system_operation_runner.h" |
+#include "storage/browser/quota/quota_manager_proxy.h" |
+#include "storage/common/fileapi/file_system_util.h" |
-namespace fileapi { |
+namespace storage { |
namespace { |
@@ -24,9 +24,7 @@ namespace { |
// |file_offset| < |file_size|) to make the remaining quota calculation easier. |
// Specifically this widens the quota for overlapping range (so that we can |
// simply compare written bytes against the adjusted quota). |
-int64 AdjustQuotaForOverlap(int64 quota, |
- int64 file_offset, |
- int64 file_size) { |
+int64 AdjustQuotaForOverlap(int64 quota, int64 file_offset, int64 file_size) { |
DCHECK_LE(file_offset, file_size); |
if (quota < 0) |
quota = 0; |
@@ -56,11 +54,12 @@ SandboxFileStreamWriter::SandboxFileStreamWriter( |
DCHECK(url_.is_valid()); |
} |
-SandboxFileStreamWriter::~SandboxFileStreamWriter() {} |
+SandboxFileStreamWriter::~SandboxFileStreamWriter() { |
+} |
-int SandboxFileStreamWriter::Write( |
- net::IOBuffer* buf, int buf_len, |
- const net::CompletionCallback& callback) { |
+int SandboxFileStreamWriter::Write(net::IOBuffer* buf, |
+ int buf_len, |
+ const net::CompletionCallback& callback) { |
has_pending_operation_ = true; |
if (local_file_writer_) |
return WriteInternal(buf, buf_len, callback); |
@@ -68,10 +67,14 @@ int SandboxFileStreamWriter::Write( |
net::CompletionCallback write_task = |
base::Bind(&SandboxFileStreamWriter::DidInitializeForWrite, |
weak_factory_.GetWeakPtr(), |
- make_scoped_refptr(buf), buf_len, callback); |
+ make_scoped_refptr(buf), |
+ buf_len, |
+ callback); |
file_system_context_->operation_runner()->CreateSnapshotFile( |
- url_, base::Bind(&SandboxFileStreamWriter::DidCreateSnapshotFile, |
- weak_factory_.GetWeakPtr(), write_task)); |
+ url_, |
+ base::Bind(&SandboxFileStreamWriter::DidCreateSnapshotFile, |
+ weak_factory_.GetWeakPtr(), |
+ write_task)); |
return net::ERR_IO_PENDING; |
} |
@@ -85,7 +88,8 @@ int SandboxFileStreamWriter::Cancel(const net::CompletionCallback& callback) { |
} |
int SandboxFileStreamWriter::WriteInternal( |
- net::IOBuffer* buf, int buf_len, |
+ net::IOBuffer* buf, |
+ int buf_len, |
const net::CompletionCallback& callback) { |
// allowed_bytes_to_write could be negative if the file size is |
// greater than the current (possibly new) quota. |
@@ -100,10 +104,12 @@ int SandboxFileStreamWriter::WriteInternal( |
buf_len = allowed_bytes_to_write_ - total_bytes_written_; |
DCHECK(local_file_writer_.get()); |
- const int result = local_file_writer_->Write( |
- buf, buf_len, |
- base::Bind(&SandboxFileStreamWriter::DidWrite, weak_factory_.GetWeakPtr(), |
- callback)); |
+ const int result = |
+ local_file_writer_->Write(buf, |
+ buf_len, |
+ base::Bind(&SandboxFileStreamWriter::DidWrite, |
+ weak_factory_.GetWeakPtr(), |
+ callback)); |
if (result != net::ERR_IO_PENDING) |
has_pending_operation_ = false; |
return result; |
@@ -114,7 +120,7 @@ void SandboxFileStreamWriter::DidCreateSnapshotFile( |
base::File::Error file_error, |
const base::File::Info& file_info, |
const base::FilePath& platform_path, |
- const scoped_refptr<webkit_blob::ShareableFileReference>& file_ref) { |
+ const scoped_refptr<storage::ShareableFileReference>& file_ref) { |
DCHECK(!file_ref.get()); |
if (CancelIfRequested()) |
@@ -157,13 +163,15 @@ void SandboxFileStreamWriter::DidCreateSnapshotFile( |
url_.origin(), |
FileSystemTypeToQuotaStorageType(url_.type()), |
base::Bind(&SandboxFileStreamWriter::DidGetUsageAndQuota, |
- weak_factory_.GetWeakPtr(), callback)); |
+ weak_factory_.GetWeakPtr(), |
+ callback)); |
} |
void SandboxFileStreamWriter::DidGetUsageAndQuota( |
const net::CompletionCallback& callback, |
quota::QuotaStatusCode status, |
- int64 usage, int64 quota) { |
+ int64 usage, |
+ int64 quota) { |
if (CancelIfRequested()) |
return; |
if (status != quota::kQuotaStatusOk) { |
@@ -177,7 +185,8 @@ void SandboxFileStreamWriter::DidGetUsageAndQuota( |
} |
void SandboxFileStreamWriter::DidInitializeForWrite( |
- net::IOBuffer* buf, int buf_len, |
+ net::IOBuffer* buf, |
+ int buf_len, |
const net::CompletionCallback& callback, |
int init_status) { |
if (CancelIfRequested()) |
@@ -194,9 +203,8 @@ void SandboxFileStreamWriter::DidInitializeForWrite( |
callback.Run(result); |
} |
-void SandboxFileStreamWriter::DidWrite( |
- const net::CompletionCallback& callback, |
- int write_response) { |
+void SandboxFileStreamWriter::DidWrite(const net::CompletionCallback& callback, |
+ int write_response) { |
DCHECK(has_pending_operation_); |
has_pending_operation_ = false; |
@@ -243,4 +251,4 @@ int SandboxFileStreamWriter::Flush(const net::CompletionCallback& callback) { |
return local_file_writer_->Flush(callback); |
} |
-} // namespace fileapi |
+} // namespace storage |