Adding Size() to AbstractFileEnumerator

webkit/fileapi/sandbox_mount_point_provider.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/sandbox_mount_point_provider.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/memory/scoped_callback_factory.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 532 matching lines @@
   scoped_ptr<FileSystemFileUtil::AbstractFileEnumerator> enumerator(
       sandbox_file_util_->CreateFileEnumerator(&context, FilePath()));
 
   FilePath file_path_each;
   int64 usage = 0;
 
   // TODO(ericu): This could be made much more efficient if the
   // AbstractFileEnumerator also had an interface to tell you the size of the
   // file.  ObfuscatedFileSystemFileEnumerator has already looked up the data,
   // and it's a big waste to look it up again.  The other implementers could
   // easily add it on-demand, so as not to waste time when it's not needed.

[kinuko, 2011/08/25 09:28:49]

Can we remove this TODO now?!

[ericu, 2011/08/25 18:29:30]

Yes.  [It was a little inaccurate anyway--we've already looked up the /path/ of
the underlying file, which saves time, but we don't cache the size.]

[tzik, 2011/08/26 02:41:53]

Done.

   while (!(file_path_each = enumerator->Next()).empty()) {
     base::PlatformFileInfo file_info;
     FilePath platform_file_path;
-    if (!enumerator->IsDirectory()) {
-      base::PlatformFileError error = sandbox_file_util_->GetFileInfo(
-          &context, file_path_each, &file_info, &platform_file_path);
-      if (error != base::PLATFORM_FILE_OK)
-        NOTREACHED();
-      else
-        usage += file_info.size;
-    }
+    usage += enumerator->Size();
     usage += ObfuscatedFileSystemFileUtil::ComputeFilePathCost(file_path_each);
   }
   // This clears the dirty flag too.
   FileSystemUsageCache::UpdateUsage(usage_file_path, usage);
   return usage;
 }
 
 void SandboxMountPointProvider::NotifyOriginWasAccessedOnIOThread(
     QuotaManagerProxy* proxy, const GURL& origin_url,
     fileapi::FileSystemType type) {
@@ skipping 76 matching lines @@
 
   // Creates the root directory.
   root = origin_base_path.Append(OldCreateUniqueDirectoryName(origin_url));
   if (!file_util::CreateDirectory(root))
     return FilePath();
 
   return root;
 }
 
 }  // namespace fileapi