Count-up/down the dirty count in the usage cache at FileSystemOperation, not at QuotaFU.

webkit/fileapi/quota_file_util.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/fileapi/quota_file_util.h"
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "webkit/fileapi/file_system_context.h"
 #include "webkit/fileapi/file_system_operation_context.h"
@@ skipping 28 matching lines @@
   if (allowed_bytes_growth != QuotaFileUtil::kNoLimit &&
       growth_local > 0 && growth_local > allowed_bytes_growth)
     return false;
   if (growth != NULL)
     *growth = growth_local;
 
   return true;
 }
 
 // A helper class to hook quota_util() methods before and after modifications.
-class ScopedOriginUpdateHelper {
+class OriginUpdateHelper {
  public:
-  explicit ScopedOriginUpdateHelper(
+  explicit OriginUpdateHelper(
       FileSystemOperationContext* operation_context,
       const GURL& origin_url,
       FileSystemType type)
       : operation_context_(operation_context),
         origin_url_(origin_url),
         type_(type) {
     DCHECK(operation_context_);
     DCHECK(operation_context_->file_system_context());
     DCHECK(type != kFileSystemTypeUnknown);
     quota_util_ =
         operation_context_->file_system_context()->GetQuotaUtil(type_);
     quota_manager_proxy_ =
         operation_context_->file_system_context()->quota_manager_proxy();
-    if (quota_util_)
-      quota_util_->StartUpdateOriginOnFileThread(origin_url_, type_);
   }
 
-  ~ScopedOriginUpdateHelper() {
-    if (quota_util_)
-      quota_util_->EndUpdateOriginOnFileThread(origin_url_, type_);
+  ~OriginUpdateHelper() {
   }
 
   void NotifyUpdate(int64 growth) {
     operation_context_->set_allowed_bytes_growth(
         operation_context_->allowed_bytes_growth() - growth);
     if (quota_util_)
       quota_util_->UpdateOriginUsageOnFileThread(
           quota_manager_proxy_, origin_url_, type_, growth);
   }
 
  private:
   FileSystemOperationContext* operation_context_;
   FileSystemQuotaUtil* quota_util_;
   QuotaManagerProxy* quota_manager_proxy_;
   const GURL& origin_url_;
   FileSystemType type_;
-  DISALLOW_COPY_AND_ASSIGN(ScopedOriginUpdateHelper);
+  DISALLOW_COPY_AND_ASSIGN(OriginUpdateHelper);
 };
 
 }  // namespace (anonymous)
 
 QuotaFileUtil::QuotaFileUtil(FileSystemFileUtil* underlying_file_util)
     : underlying_file_util_(underlying_file_util) {
 }
 
 QuotaFileUtil::~QuotaFileUtil() {
 }
 
 // static
 QuotaFileUtil* QuotaFileUtil::CreateDefault() {
   return new QuotaFileUtil(new FileSystemFileUtil());
 }
 
 base::PlatformFileError QuotaFileUtil::CopyOrMoveFile(
     FileSystemOperationContext* fs_context,
     const FilePath& src_file_path,
     const FilePath& dest_file_path,
     bool copy) {
   DCHECK(fs_context);
 
   // TODO(kinuko): For cross-filesystem move case we need 2 helpers, one for
   // src and one for dest.
-  ScopedOriginUpdateHelper helper(
+  OriginUpdateHelper helper(

[kinuko, 2011/08/25 09:12:00]

If all we do is calling NotifyUpdate() it looks like we can simply make the
NotifyUpdate a simple function in an anonymous namespace and can get rid of the
class entirely?

[Dai Mikurube (NOT FULLTIME), 2011/08/25 09:19:46]

Ah, exactly.  I'll modify it in the next change.

       fs_context,
       fs_context->dest_origin_url(),
       fs_context->dest_type());
 
   int64 growth = 0;
 
   // It assumes copy/move operations are always in the same fs currently.
   // TODO(dmikurube): Do quota check if moving between different fs.
   if (copy) {
     int64 allowed_bytes_growth = fs_context->allowed_bytes_growth();
@@ skipping 16 matching lines @@
     helper.NotifyUpdate(growth);
   }
 
   return error;
 }
 
 base::PlatformFileError QuotaFileUtil::DeleteFile(
     FileSystemOperationContext* fs_context,
     const FilePath& file_path) {
   DCHECK(fs_context);
-  ScopedOriginUpdateHelper helper(
+  OriginUpdateHelper helper(
       fs_context,
       fs_context->src_origin_url(),
       fs_context->src_type());
 
   int64 growth = 0;
   base::PlatformFileInfo file_info;
   if (!file_util::GetFileInfo(file_path, &file_info))
     file_info.size = 0;
   growth = -file_info.size;
 
   base::PlatformFileError error = underlying_file_util_->DeleteFile(
       fs_context, file_path);
 
   if (error == base::PLATFORM_FILE_OK)
     helper.NotifyUpdate(growth);
 
   return error;
 }
 
 base::PlatformFileError QuotaFileUtil::Truncate(
     FileSystemOperationContext* fs_context,
     const FilePath& path,
     int64 length) {
   int64 allowed_bytes_growth = fs_context->allowed_bytes_growth();
-  ScopedOriginUpdateHelper helper(
+  OriginUpdateHelper helper(
       fs_context,
       fs_context->src_origin_url(),
       fs_context->src_type());
 
   int64 growth = 0;
   base::PlatformFileInfo file_info;
   if (!file_util::GetFileInfo(path, &file_info))
     return base::PLATFORM_FILE_ERROR_FAILED;
 
   growth = length - file_info.size;
   if (allowed_bytes_growth != kNoLimit &&
       growth > 0 && growth > allowed_bytes_growth)
     return base::PLATFORM_FILE_ERROR_NO_SPACE;
 
   base::PlatformFileError error = underlying_file_util_->Truncate(
       fs_context, path, length);
 
   if (error == base::PLATFORM_FILE_OK)
     helper.NotifyUpdate(growth);
 
   return error;
 }
 
 }  // namespace fileapi