diff options
| author | tzik@chromium.org <tzik@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-11 07:35:13 +0000 |
|---|---|---|
| committer | tzik@chromium.org <tzik@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-11 07:35:13 +0000 |
| commit | 294dd0316b3246c30e4558e8ec380479c9e82481 (patch) | |
| tree | 0da556f3aa34918cd33ba14ab80e9acfbb8574f9 /webkit/fileapi/native_file_util.cc | |
| parent | 27d255b7a75a9a21fca70a90eae07c6cf22ae30b (diff) | |
| download | chromium_src-294dd0316b3246c30e4558e8ec380479c9e82481.zip chromium_src-294dd0316b3246c30e4558e8ec380479c9e82481.tar.gz chromium_src-294dd0316b3246c30e4558e8ec380479c9e82481.tar.bz2 | |
Merge QuotaFileUtil into ObfuscatedFileUtil
This change includes
- rename variable name of paths, (e.g. "filesystem:http://example.com/temporary/hoge/fuga")
--- path: FileSystemPath past by upper layer, ("http://example.com", kTemporary, "hoge/fuga")
--- virtual_path: path.internal_path(), ("hoge/fuga")
--- local_path: origin, type & absolute native path
--- local_file_path: absolute native path (e.g. "/home/tzik/.config/chromium/Default/File System/001/t/00/0000001")
--- data_path: native path, relative to origin directory (e.g. "00/0000001")
- use FilePath instead of FileSystemPath for source path in CopyInForeignFile.
- refactor CopyOrMoveFile and CopyInForeignFile of ObfuscatedFileUtil
- merge QuotaFileUtil into ObfuscatedFileUtil
- fixing tests
BUG=114732
TEST='ObfuscatedFileUtilTest.*'
Review URL: https://chromiumcodereview.appspot.com/10051004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136521 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/fileapi/native_file_util.cc')
| -rw-r--r-- | webkit/fileapi/native_file_util.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/webkit/fileapi/native_file_util.cc b/webkit/fileapi/native_file_util.cc index f73c74a..26da7a1 100644 --- a/webkit/fileapi/native_file_util.cc +++ b/webkit/fileapi/native_file_util.cc @@ -262,12 +262,11 @@ PlatformFileError NativeFileUtil::CopyOrMoveFile( PlatformFileError NativeFileUtil::CopyInForeignFile( FileSystemOperationContext* context, - const FileSystemPath& underlying_src_path, + const FilePath& src_file_path, const FileSystemPath& dest_path) { - return CopyOrMoveFile(context, - underlying_src_path, - dest_path, - true); + if (file_util::CopyFile(src_file_path, dest_path.internal_path())) + return base::PLATFORM_FILE_OK; + return base::PLATFORM_FILE_ERROR_FAILED; } PlatformFileError NativeFileUtil::DeleteFile( |