FileSystem mods: Changes to snapshot file creation to remove dependencies on blobs.

content/browser/fileapi/fileapi_message_filter.h

 // Copyright (c) 2012 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.
 
 #ifndef CONTENT_BROWSER_FILEAPI_FILEAPI_MESSAGE_FILTER_H_
 #define CONTENT_BROWSER_FILEAPI_FILEAPI_MESSAGE_FILTER_H_
 
+#include <map>
 #include <set>
 #include <string>
 
 #include "base/callback.h"
 #include "base/files/file_util_proxy.h"
 #include "base/hash_tables.h"
 #include "base/id_map.h"
 #include "base/platform_file.h"
 #include "base/shared_memory.h"
 #include "content/public/browser/browser_message_filter.h"
@@ skipping 90 matching lines @@
                    const base::Time& last_access_time,
                    const base::Time& last_modified_time);
   void OnCancel(int request_id, int request_to_cancel);
   void OnOpenFile(int request_id, const GURL& path, int file_flags);
   void OnNotifyCloseFile(const GURL& path);
   void OnWillUpdate(const GURL& path);
   void OnDidUpdate(const GURL& path, int64 delta);
   void OnSyncGetPlatformPath(const GURL& path,
                              base::FilePath* platform_path);
   void OnCreateSnapshotFile(int request_id,
-                            const GURL& blob_url,
                             const GURL& path);
+  void OnDidReceiveSnapshotFile(int request_id);
+
+  void OnCreateSnapshotFile_Deprecated(int request_id,
+                                       const GURL& blob_url,
+                                       const GURL& path);
 
   void OnStartBuildingBlob(const GURL& url);
   void OnAppendBlobDataItem(const GURL& url,
                             const webkit_blob::BlobData::Item& item);
   void OnAppendSharedMemory(const GURL& url, base::SharedMemoryHandle handle,
                             size_t buffer_size);
   void OnFinishBuildingBlob(const GURL& url, const std::string& content_type);
   void OnCloneBlob(const GURL& url, const GURL& src_url);
   void OnRemoveBlob(const GURL& url);
 
@@ skipping 18 matching lines @@
                 int64 bytes,
                 bool complete);
   void DidOpenFileSystem(int request_id,
                          base::PlatformFileError result,
                          const std::string& name,
                          const GURL& root);
   void DidDeleteFileSystem(int request_id,
                            base::PlatformFileError result);
   void DidCreateSnapshot(
       int request_id,
+      const fileapi::FileSystemURL& url,
+      base::PlatformFileError result,
+      const base::PlatformFileInfo& info,
+      const base::FilePath& platform_path,
+      const scoped_refptr<webkit_blob::ShareableFileReference>& file_ref);
+
+  void DidCreateSnapshot_Deprecated(
+      int request_id,
       const base::Callback<void(const base::FilePath&)>& register_file_callback,
       base::PlatformFileError result,
       const base::PlatformFileInfo& info,
       const base::FilePath& platform_path,
       const scoped_refptr<webkit_blob::ShareableFileReference>& file_ref);
-
   // Registers the given file pointed by |virtual_path| and backed by
-  // |platform_path| as the |blob_url|.  Called by DidCreateSnapshot.
+  // |platform_path| as the |blob_url|.  Called by DidCreateSnapshot_Deprecated.
   void RegisterFileAsBlob(const GURL& blob_url,
                           const fileapi::FileSystemURL& url,
                           const base::FilePath& platform_path);
 
   // Checks renderer's access permissions for single file.
   bool HasPermissionsForFile(const fileapi::FileSystemURL& url,
                              int permissions,
                              base::PlatformFileError* error);
 
   // Creates a new FileSystemOperation based on |target_url|.
@@ skipping 13 matching lines @@
   // IO thread, which will extract the net::URLRequestContext from it.
   scoped_refptr<net::URLRequestContextGetter> request_context_getter_;
   net::URLRequestContext* request_context_;
 
   scoped_refptr<ChromeBlobStorageContext> blob_storage_context_;
 
   // Keep track of blob URLs registered in this process. Need to unregister
   // all of them when the renderer process dies.
   base::hash_set<std::string> blob_urls_;
 
+  // Used to keep snapshot files alive while a DidCreateSnapshot
+  // is being sent to the renderer.
+  std::map<int, scoped_refptr<webkit_blob::ShareableFileReference> >
+      in_transit_snapshot_files_;
+
   // Keep track of file system file URLs opened by OpenFile() in this process.
   // Need to close all of them when the renderer process dies.
   std::multiset<GURL> open_filesystem_urls_;
 
   DISALLOW_COPY_AND_ASSIGN(FileAPIMessageFilter);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_FILEAPI_FILEAPI_MESSAGE_FILTER_H_