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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: webkit/fileapi/file_system_operation.cc

Issue 7470037: [Refactor] to rename and re-layer the file_util stack layers. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Rebased. Created 9 years, 4 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
« webkit/chromeos/fileapi/cros_mount_point_provider.cc ('K') | « webkit/fileapi/file_system_operation.h ('k') | webkit/fileapi/file_system_operation_context.h » ('j') | webkit/fileapi/native_file_util_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/fileapi/file_system_operation.cc
diff --git a/webkit/fileapi/file_system_operation.cc b/webkit/fileapi/file_system_operation.cc
index 4391f3615fc2d445ae03aed958bc3fa2ad59243b..64448832246ae296a8b8fed4bfa2d8ad5e98346c 100644
--- a/webkit/fileapi/file_system_operation.cc
+++ b/webkit/fileapi/file_system_operation.cc
@@ -17,7 +17,7 @@
#include "webkit/fileapi/file_system_types.h"
#include "webkit/fileapi/file_system_util.h"
#include "webkit/fileapi/file_writer_delegate.h"
-#include "webkit/fileapi/local_file_system_file_util.h"
+#include "webkit/fileapi/local_file_util.h"
#include "webkit/fileapi/quota_file_util.h"
#include "webkit/quota/quota_types.h"
@@ -27,11 +27,10 @@ FileSystemOperation::FileSystemOperation(
FileSystemCallbackDispatcher* dispatcher,
scoped_refptr<base::MessageLoopProxy> proxy,
FileSystemContext* file_system_context,
- FileSystemFileUtil* file_system_file_util)
+ FileSystemFileUtil* file_util)
: proxy_(proxy),
dispatcher_(dispatcher),
- file_system_operation_context_(
- file_system_context, file_system_file_util),
+ file_system_operation_context_(file_system_context, file_util),
callback_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
DCHECK(dispatcher);
#ifndef NDEBUG
@@ -76,18 +75,16 @@ void FileSystemOperation::CreateFile(const GURL& path,
#endif
GURL origin_url;
FileSystemType type;
- FileSystemFileUtil* file_system_file_util;
- if (!VerifyFileSystemPathForWrite(
- path, true /* create */, &origin_url, &type, &src_virtual_path_,
- &file_system_file_util)) {
+ FileSystemFileUtil* file_util;
+ if (!VerifyFileSystemPathForWrite(path, true /* create */, &origin_url,
+ &type, &src_virtual_path_, &file_util)) {
delete this;
return;
}
file_system_operation_context_.set_src_origin_url(origin_url);
file_system_operation_context_.set_src_type(type);
- if (!file_system_operation_context_.src_file_system_file_util())
- file_system_operation_context_.set_src_file_system_file_util(
- file_system_file_util);
+ if (!file_system_operation_context_.src_file_util())
+ file_system_operation_context_.set_src_file_util(file_util);
exclusive_ = exclusive;
GetUsageAndQuotaThenCallback(origin_url, callback_factory_.NewCallback(
@@ -122,19 +119,17 @@ void FileSystemOperation::CreateDirectory(const GURL& path,
#endif
GURL origin_url;
FileSystemType type;
- FileSystemFileUtil* file_system_file_util;
+ FileSystemFileUtil* file_util;
- if (!VerifyFileSystemPathForWrite(
- path, true /* create */, &origin_url, &type, &src_virtual_path_,
- &file_system_file_util)) {
+ if (!VerifyFileSystemPathForWrite(path, true /* create */, &origin_url,
+ &type, &src_virtual_path_, &file_util)) {
delete this;
return;
}
file_system_operation_context_.set_src_origin_url(origin_url);
file_system_operation_context_.set_src_type(type);
- if (!file_system_operation_context_.src_file_system_file_util())
- file_system_operation_context_.set_src_file_system_file_util(
- file_system_file_util);
+ if (!file_system_operation_context_.src_file_util())
+ file_system_operation_context_.set_src_file_util(file_util);
exclusive_ = exclusive;
recursive_ = recursive;
@@ -172,14 +167,13 @@ void FileSystemOperation::Copy(const GURL& src_path,
GURL dest_origin_url;
FileSystemType src_type;
FileSystemType dest_type;
- FileSystemFileUtil* src_file_system_file_util;
- FileSystemFileUtil* dest_file_system_file_util;
+ FileSystemFileUtil* src_file_util;
+ FileSystemFileUtil* dest_file_util;
if (!VerifyFileSystemPathForRead(src_path, &src_origin_url, &src_type,
- &src_virtual_path_, &src_file_system_file_util) ||
+ &src_virtual_path_, &src_file_util) ||
!VerifyFileSystemPathForWrite(dest_path, true /* create */,
- &dest_origin_url, &dest_type, &dest_virtual_path_,
- &dest_file_system_file_util)) {
+ &dest_origin_url, &dest_type, &dest_virtual_path_, &dest_file_util)) {
delete this;
return;
}
@@ -187,12 +181,10 @@ void FileSystemOperation::Copy(const GURL& src_path,
file_system_operation_context_.set_dest_origin_url(dest_origin_url);
file_system_operation_context_.set_src_type(src_type);
file_system_operation_context_.set_dest_type(dest_type);
- if (!file_system_operation_context_.src_file_system_file_util())
- file_system_operation_context_.set_src_file_system_file_util(
- src_file_system_file_util);
- if (!file_system_operation_context_.dest_file_system_file_util())
- file_system_operation_context_.set_dest_file_system_file_util(
- dest_file_system_file_util);
+ if (!file_system_operation_context_.src_file_util())
+ file_system_operation_context_.set_src_file_util(src_file_util);
+ if (!file_system_operation_context_.dest_file_util())
+ file_system_operation_context_.set_dest_file_util(dest_file_util);
GetUsageAndQuotaThenCallback(dest_origin_url, callback_factory_.NewCallback(
&FileSystemOperation::DelayedCopyForQuota));
@@ -227,14 +219,13 @@ void FileSystemOperation::Move(const GURL& src_path,
GURL dest_origin_url;
FileSystemType src_type;
FileSystemType dest_type;
- FileSystemFileUtil* src_file_system_file_util;
- FileSystemFileUtil* dest_file_system_file_util;
+ FileSystemFileUtil* src_file_util;
+ FileSystemFileUtil* dest_file_util;
if (!VerifyFileSystemPathForWrite(src_path, false, &src_origin_url, &src_type,
- &src_virtual_path_, &src_file_system_file_util) ||
+ &src_virtual_path_, &src_file_util) ||
!VerifyFileSystemPathForWrite(dest_path, true /* create */,
- &dest_origin_url, &dest_type, &dest_virtual_path_,
- &dest_file_system_file_util)) {
+ &dest_origin_url, &dest_type, &dest_virtual_path_, &dest_file_util)) {
delete this;
return;
}
@@ -242,12 +233,10 @@ void FileSystemOperation::Move(const GURL& src_path,
file_system_operation_context_.set_dest_origin_url(dest_origin_url);
file_system_operation_context_.set_src_type(src_type);
file_system_operation_context_.set_dest_type(dest_type);
- if (!file_system_operation_context_.src_file_system_file_util())
- file_system_operation_context_.set_src_file_system_file_util(
- src_file_system_file_util);
- if (!file_system_operation_context_.dest_file_system_file_util())
- file_system_operation_context_.set_dest_file_system_file_util(
- dest_file_system_file_util);
+ if (!file_system_operation_context_.src_file_util())
+ file_system_operation_context_.set_src_file_util(src_file_util);
+ if (!file_system_operation_context_.dest_file_util())
+ file_system_operation_context_.set_dest_file_util(dest_file_util);
GetUsageAndQuotaThenCallback(dest_origin_url, callback_factory_.NewCallback(
&FileSystemOperation::DelayedMoveForQuota));
@@ -281,17 +270,16 @@ void FileSystemOperation::DirectoryExists(const GURL& path) {
FilePath virtual_path;
GURL origin_url;
FileSystemType type;
- FileSystemFileUtil* file_system_file_util;
+ FileSystemFileUtil* file_util;
if (!VerifyFileSystemPathForRead(path, &origin_url, &type, &virtual_path,
- &file_system_file_util)) {
+ &file_util)) {
delete this;
return;
}
file_system_operation_context_.set_src_origin_url(origin_url);
file_system_operation_context_.set_src_type(type);
- if (!file_system_operation_context_.src_file_system_file_util())
- file_system_operation_context_.set_src_file_system_file_util(
- file_system_file_util);
+ if (!file_system_operation_context_.src_file_util())
+ file_system_operation_context_.set_src_file_util(file_util);
FileSystemFileUtilProxy::GetFileInfo(
file_system_operation_context_,
proxy_, virtual_path, callback_factory_.NewCallback(
@@ -307,17 +295,16 @@ void FileSystemOperation::FileExists(const GURL& path) {
FilePath virtual_path;
GURL origin_url;
FileSystemType type;
- FileSystemFileUtil* file_system_file_util;
+ FileSystemFileUtil* file_util;
if (!VerifyFileSystemPathForRead(path, &origin_url, &type, &virtual_path,
- &file_system_file_util)) {
+ &file_util)) {
delete this;
return;
}
file_system_operation_context_.set_src_origin_url(origin_url);
file_system_operation_context_.set_src_type(type);
- if (!file_system_operation_context_.src_file_system_file_util())
- file_system_operation_context_.set_src_file_system_file_util(
- file_system_file_util);
+ if (!file_system_operation_context_.src_file_util())
+ file_system_operation_context_.set_src_file_util(file_util);
FileSystemFileUtilProxy::GetFileInfo(
file_system_operation_context_,
proxy_, virtual_path, callback_factory_.NewCallback(
@@ -333,17 +320,16 @@ void FileSystemOperation::GetMetadata(const GURL& path) {
FilePath virtual_path;
GURL origin_url;
FileSystemType type;
- FileSystemFileUtil* file_system_file_util;
+ FileSystemFileUtil* file_util;
if (!VerifyFileSystemPathForRead(path, &origin_url, &type, &virtual_path,
- &file_system_file_util)) {
+ &file_util)) {
delete this;
return;
}
file_system_operation_context_.set_src_origin_url(origin_url);
file_system_operation_context_.set_src_type(type);
- if (!file_system_operation_context_.src_file_system_file_util())
- file_system_operation_context_.set_src_file_system_file_util(
- file_system_file_util);
+ if (!file_system_operation_context_.src_file_util())
+ file_system_operation_context_.set_src_file_util(file_util);
FileSystemFileUtilProxy::GetFileInfo(
file_system_operation_context_,
proxy_, virtual_path, callback_factory_.NewCallback(
@@ -359,17 +345,16 @@ void FileSystemOperation::ReadDirectory(const GURL& path) {
FilePath virtual_path;
GURL origin_url;
FileSystemType type;
- FileSystemFileUtil* file_system_file_util;
+ FileSystemFileUtil* file_util;
if (!VerifyFileSystemPathForRead(path, &origin_url, &type, &virtual_path,
- &file_system_file_util)) {
+ &file_util)) {
delete this;
return;
}
file_system_operation_context_.set_src_origin_url(origin_url);
file_system_operation_context_.set_src_type(type);
- if (!file_system_operation_context_.src_file_system_file_util())
- file_system_operation_context_.set_src_file_system_file_util(
- file_system_file_util);
+ if (!file_system_operation_context_.src_file_util())
+ file_system_operation_context_.set_src_file_util(file_util);
FileSystemFileUtilProxy::ReadDirectory(
file_system_operation_context_,
proxy_, virtual_path, callback_factory_.NewCallback(
@@ -385,17 +370,16 @@ void FileSystemOperation::Remove(const GURL& path, bool recursive) {
FilePath virtual_path;
GURL origin_url;
FileSystemType type;
- FileSystemFileUtil* file_system_file_util;
+ FileSystemFileUtil* file_util;
if (!VerifyFileSystemPathForWrite(path, false /* create */, &origin_url,
- &type, &virtual_path, &file_system_file_util)) {
+ &type, &virtual_path, &file_util)) {
delete this;
return;
}
file_system_operation_context_.set_src_origin_url(origin_url);
file_system_operation_context_.set_src_type(type);
- if (!file_system_operation_context_.src_file_system_file_util())
- file_system_operation_context_.set_src_file_system_file_util(
- file_system_file_util);
+ if (!file_system_operation_context_.src_file_util())
+ file_system_operation_context_.set_src_file_util(file_util);
FileSystemFileUtilProxy::Delete(
file_system_operation_context_,
proxy_, virtual_path, recursive, callback_factory_.NewCallback(
@@ -413,17 +397,16 @@ void FileSystemOperation::Write(
#endif
GURL origin_url;
FileSystemType type;
- FileSystemFileUtil* file_system_file_util;
+ FileSystemFileUtil* file_util;
if (!VerifyFileSystemPathForWrite(path, true /* create */, &origin_url,
- &type, &src_virtual_path_, &file_system_file_util)) {
+ &type, &src_virtual_path_, &file_util)) {
delete this;
return;
}
file_system_operation_context_.set_src_origin_url(origin_url);
file_system_operation_context_.set_src_type(type);
- if (!file_system_operation_context_.src_file_system_file_util())
- file_system_operation_context_.set_src_file_system_file_util(
- file_system_file_util);
+ if (!file_system_operation_context_.src_file_util())
+ file_system_operation_context_.set_src_file_util(file_util);
DCHECK(blob_url.is_valid());
file_writer_delegate_.reset(new FileWriterDelegate(this, offset, proxy_));
blob_request_.reset(
@@ -461,17 +444,16 @@ void FileSystemOperation::Truncate(const GURL& path, int64 length) {
#endif
GURL origin_url;
FileSystemType type;
- FileSystemFileUtil* file_system_file_util;
+ FileSystemFileUtil* file_util;
if (!VerifyFileSystemPathForWrite(path, false /* create */, &origin_url,
- &type, &src_virtual_path_, &file_system_file_util)) {
+ &type, &src_virtual_path_, &file_util)) {
delete this;
return;
}
file_system_operation_context_.set_src_origin_url(origin_url);
file_system_operation_context_.set_src_type(type);
- if (!file_system_operation_context_.src_file_system_file_util())
- file_system_operation_context_.set_src_file_system_file_util(
- file_system_file_util);
+ if (!file_system_operation_context_.src_file_util())
+ file_system_operation_context_.set_src_file_util(file_util);
length_ = length;
GetUsageAndQuotaThenCallback(origin_url, callback_factory_.NewCallback(
@@ -507,17 +489,16 @@ void FileSystemOperation::TouchFile(const GURL& path,
FilePath virtual_path;
GURL origin_url;
FileSystemType type;
- FileSystemFileUtil* file_system_file_util;
+ FileSystemFileUtil* file_util;
if (!VerifyFileSystemPathForWrite(path, true /* create */, &origin_url,
- &type, &virtual_path, &file_system_file_util)) {
+ &type, &virtual_path, &file_util)) {
delete this;
return;
}
file_system_operation_context_.set_src_origin_url(origin_url);
file_system_operation_context_.set_src_type(type);
- if (!file_system_operation_context_.src_file_system_file_util())
- file_system_operation_context_.set_src_file_system_file_util(
- file_system_file_util);
+ if (!file_system_operation_context_.src_file_util())
+ file_system_operation_context_.set_src_file_util(file_util);
FileSystemFileUtilProxy::Touch(
file_system_operation_context_,
proxy_, virtual_path, last_access_time, last_modified_time,
@@ -535,7 +516,7 @@ void FileSystemOperation::OpenFile(const GURL& path,
peer_handle_ = peer_handle;
GURL origin_url;
FileSystemType type;
- FileSystemFileUtil* file_system_file_util;
+ FileSystemFileUtil* file_util;
if (file_flags & (
(base::PLATFORM_FILE_ENUMERATE | base::PLATFORM_FILE_TEMPORARY |
base::PLATFORM_FILE_HIDDEN))) {
@@ -549,22 +530,21 @@ void FileSystemOperation::OpenFile(const GURL& path,
base::PLATFORM_FILE_DELETE_ON_CLOSE |
base::PLATFORM_FILE_WRITE_ATTRIBUTES)) {
if (!VerifyFileSystemPathForWrite(path, true /* create */, &origin_url,
- &type, &src_virtual_path_, &file_system_file_util)) {
+ &type, &src_virtual_path_, &file_util)) {
delete this;
return;
}
} else {
if (!VerifyFileSystemPathForRead(path, &origin_url, &type,
- &src_virtual_path_, &file_system_file_util)) {
+ &src_virtual_path_, &file_util)) {
delete this;
return;
}
}
file_system_operation_context_.set_src_origin_url(origin_url);
file_system_operation_context_.set_src_type(type);
- if (!file_system_operation_context_.src_file_system_file_util())
- file_system_operation_context_.set_src_file_system_file_util(
- file_system_file_util);
+ if (!file_system_operation_context_.src_file_util())
+ file_system_operation_context_.set_src_file_util(file_util);
file_flags_ = file_flags;
GetUsageAndQuotaThenCallback(origin_url, callback_factory_.NewCallback(
@@ -794,7 +774,7 @@ void FileSystemOperation::OnFileOpenedForWrite(
bool FileSystemOperation::VerifyFileSystemPathForRead(
const GURL& path, GURL* origin_url, FileSystemType* type,
- FilePath* virtual_path, FileSystemFileUtil** file_system_file_util) {
+ FilePath* virtual_path, FileSystemFileUtil** file_util) {
// If we have no context, we just allow any operations, for testing.
// TODO(ericu): Revisit this hack for security.
@@ -813,7 +793,7 @@ bool FileSystemOperation::VerifyFileSystemPathForRead(
#endif
*type = file_system_operation_context_.src_type();
*origin_url = file_system_operation_context_.src_origin_url();
- *file_system_file_util = NULL;
+ *file_util = NULL;
return true;
}
@@ -828,10 +808,9 @@ bool FileSystemOperation::VerifyFileSystemPathForRead(
dispatcher_->DidFail(base::PLATFORM_FILE_ERROR_SECURITY);
return false;
}
- DCHECK(file_system_file_util);
- *file_system_file_util =
- file_system_context()->path_manager()->GetFileSystemFileUtil(*type);
- DCHECK(*file_system_file_util);
+ DCHECK(file_util);
+ *file_util = file_system_context()->path_manager()->GetFileUtil(*type);
+ DCHECK(*file_util);
// We notify this read access whether the read access succeeds or not.
// This must be ok since this is used to let the QM's eviction logic know
@@ -850,7 +829,7 @@ bool FileSystemOperation::VerifyFileSystemPathForRead(
bool FileSystemOperation::VerifyFileSystemPathForWrite(
const GURL& path, bool create, GURL* origin_url, FileSystemType* type,
- FilePath* virtual_path, FileSystemFileUtil** file_system_file_util) {
+ FilePath* virtual_path, FileSystemFileUtil** file_util) {
// If we have no context, we just allow any operations, for testing.
// TODO(ericu): Revisit this hack for security.
@@ -869,7 +848,7 @@ bool FileSystemOperation::VerifyFileSystemPathForWrite(
#endif
*type = file_system_operation_context_.dest_type();
*origin_url = file_system_operation_context_.dest_origin_url();
- *file_system_file_util = NULL;
+ *file_util = NULL;
return true;
}
@@ -893,10 +872,9 @@ bool FileSystemOperation::VerifyFileSystemPathForWrite(
dispatcher_->DidFail(base::PLATFORM_FILE_ERROR_SECURITY);
return false;
}
- DCHECK(file_system_file_util);
- *file_system_file_util =
- file_system_context()->path_manager()->GetFileSystemFileUtil(*type);
- DCHECK(*file_system_file_util);
+ DCHECK(file_util);
+ *file_util = file_system_context()->path_manager()->GetFileUtil(*type);
+ DCHECK(*file_util);
return true;
}
« webkit/chromeos/fileapi/cros_mount_point_provider.cc ('K') | « webkit/fileapi/file_system_operation.h ('k') | webkit/fileapi/file_system_operation_context.h » ('j') | webkit/fileapi/native_file_util_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698