1 files changed, 49 insertions, 2 deletions

diff --git a/webkit/fileapi/file_system_operation_context.h b/webkit/fileapi/file_system_operation_context.h
index 68f5e47..d4c7f2f 100644
--- a/webkit/fileapi/file_system_operation_context.h
+++ b/webkit/fileapi/file_system_operation_context.h
@@ -5,24 +5,71 @@
 #ifndef WEBKIT_FILEAPI_FILE_SYSTEM_OPERATION_CONTEXT_H_
 #define WEBKIT_FILEAPI_FILE_SYSTEM_OPERATION_CONTEXT_H_
 
+#include "base/ref_counted.h"
+#include "googleurl/src/gurl.h"
 #include "webkit/fileapi/file_system_file_util.h"
+#include "webkit/fileapi/file_system_types.h"
 
 namespace fileapi {
 
+class FileSystemContext;
+
 class FileSystemOperationContext {
  public:
-  FileSystemOperationContext(FileSystemFileUtil* file_system_file_util)
-      : file_system_file_util_(file_system_file_util) {
+  FileSystemOperationContext(
+      FileSystemContext* context,
+      FileSystemFileUtil* file_system_file_util);
+
+  FileSystemContext* file_system_context() const {
+    return file_system_context_.get();
   }
 
   FileSystemFileUtil* file_system_file_util() const {
     return file_system_file_util_;
   }
 
+  void set_src_origin_url(const GURL& url) {
+    src_origin_url_ = url;
+  }
+
+  const GURL& src_origin_url() const {
+    return src_origin_url_;
+  }
+
+  void set_dest_origin_url(const GURL& url) {
+    dest_origin_url_ = url;
+  }
+
+  const GURL& dest_origin_url() const {
+    return dest_origin_url_;
+  }
+
+  FileSystemType src_type() const {
+    return src_type_;
+  }
+
+  void set_src_type(FileSystemType src_type) {
+    src_type_ = src_type;
+  }
+
+  FileSystemType dest_type() const {
+    return dest_type_;
+  }
+
+  void set_dest_type(FileSystemType dest_type) {
+    dest_type_ = dest_type;
+  }
+
  private:
   // This file_system_file_util_ is not "owned" by FileSystemOperationContext.
   // It is supposed to be a pointer to a singleton.
+  scoped_refptr<FileSystemContext> file_system_context_;
   FileSystemFileUtil* file_system_file_util_;
+
+  GURL src_origin_url_;  // Also used for any single-path operation.
+  GURL dest_origin_url_;
+  FileSystemType src_type_;  // Also used for any single-path operation.
+  FileSystemType dest_type_;
 };
 
 }  // namespace fileapi