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"
 #include "base/message_loop.h"
 #include "base/message_loop_proxy.h"
 #include "base/rand_util.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/net_util.h"
 #include "webkit/fileapi/file_system_operation_context.h"
 #include "webkit/fileapi/file_system_path_manager.h"
 #include "webkit/fileapi/file_system_types.h"
 #include "webkit/fileapi/file_system_usage_cache.h"
 #include "webkit/fileapi/file_system_util.h"
 #include "webkit/fileapi/local_file_system_file_util.h"
 #include "webkit/fileapi/obfuscated_file_system_file_util.h"
 #include "webkit/fileapi/quota_file_util.h"
-#include "webkit/fileapi/sandbox_mount_point_provider.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/quota/quota_manager.h"
 
 using quota::QuotaManagerProxy;
 
 namespace {
 
 static const FilePath::CharType kOldFileSystemUniqueNamePrefix[] =
     FILE_PATH_LITERAL("chrome-");
 static const int kOldFileSystemUniqueLength = 16;
@@ skipping 502 matching lines @@
 
   FileSystemOperationContext context(NULL, sandbox_file_util_);
   context.set_src_origin_url(origin_url);
   context.set_src_type(type);
   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.
   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