diff options
author | kinuko@chromium.org <kinuko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-24 08:11:33 +0000 |
---|---|---|
committer | kinuko@chromium.org <kinuko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-24 08:11:33 +0000 |
commit | 8b35edaaf1c2b8d76af2bda65a3bb5524edb1378 (patch) | |
tree | 0924b2975596d9470af1727a11d9d28092120807 /webkit/fileapi/file_system_operation.cc | |
parent | 904772bb54ac4f00c2571aa1e8a10be118933e18 (diff) | |
download | chromium_src-8b35edaaf1c2b8d76af2bda65a3bb5524edb1378.zip chromium_src-8b35edaaf1c2b8d76af2bda65a3bb5524edb1378.tar.gz chromium_src-8b35edaaf1c2b8d76af2bda65a3bb5524edb1378.tar.bz2 |
Revert 86400 - Notify read access to the QuotaManager in FileSystemOperation
BUG=none
TEST=FileSystemOperationTest.*
Review URL: http://codereview.chromium.org/7054012
TBR=kinuko@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86405 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/fileapi/file_system_operation.cc')
-rw-r--r-- | webkit/fileapi/file_system_operation.cc | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/webkit/fileapi/file_system_operation.cc b/webkit/fileapi/file_system_operation.cc index e994f21..9692cb3 100644 --- a/webkit/fileapi/file_system_operation.cc +++ b/webkit/fileapi/file_system_operation.cc @@ -13,7 +13,6 @@ #include "webkit/fileapi/file_system_file_util_proxy.h" #include "webkit/fileapi/file_system_operation_context.h" #include "webkit/fileapi/file_system_path_manager.h" -#include "webkit/fileapi/file_system_quota_util.h" #include "webkit/fileapi/file_system_types.h" #include "webkit/fileapi/file_system_util.h" #include "webkit/fileapi/file_writer_delegate.h" @@ -37,6 +36,9 @@ FileSystemOperation::FileSystemOperation( #ifndef NDEBUG pending_operation_ = kOperationNone; #endif + // TODO(dmikurube): Read and set available bytes from the Quota Manager. + file_system_operation_context_.set_allowed_bytes_growth( + QuotaFileUtil::kNoLimit); } FileSystemOperation::~FileSystemOperation() { @@ -654,9 +656,8 @@ void FileSystemOperation::DidEnsureFileExistsExclusive( if (rv == base::PLATFORM_FILE_OK && !created) { dispatcher_->DidFail(base::PLATFORM_FILE_ERROR_EXISTS); delete this; - } else { + } else DidFinishFileOperation(rv); - } } void FileSystemOperation::DidEnsureFileExistsNonExclusive( @@ -817,16 +818,6 @@ bool FileSystemOperation::VerifyFileSystemPathForRead( file_system_context()->path_manager()->GetFileSystemFileUtil(*type); DCHECK(*file_system_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 - // someone is interested in reading the origin data and therefore to indicate - // that evicting this origin may not be a good idea. - file_system_context()->GetQuotaUtil(*type)-> - NotifyOriginWasAccessedOnIOThread( - file_system_context()->quota_manager_proxy(), - *origin_url, - *type); - return true; } |