AppCacheResponse storage implementation

webkit/appcache/appcache_response.h

Index: webkit/appcache/appcache_response.h
===================================================================
--- webkit/appcache/appcache_response.h	(revision 29600)
+++ webkit/appcache/appcache_response.h	(working copy)
@@ -5,23 +5,25 @@
 #ifndef WEBKIT_APPCACHE_APPCACHE_RESPONSE_H_
 #define WEBKIT_APPCACHE_APPCACHE_RESPONSE_H_
 
-#include "base/logging.h"
+#include "base/compiler_specific.h"
 #include "base/ref_counted.h"
+#include "base/scoped_ptr.h"
 #include "net/base/completion_callback.h"
 #include "net/http/http_response_info.h"
 #include "webkit/appcache/appcache_interfaces.h"
-#include "webkit/appcache/appcache_service.h"
-#include "webkit/appcache/appcache_storage.h"
 
 namespace net {
 class IOBuffer;
 }
 namespace disk_cache {
+class Entry;
 class Backend;
 };
 
 namespace appcache {
 
+class AppCacheService;
+
 // Response info for a particular response id. Instances are tracked in
 // the working set.
 class AppCacheResponseInfo
@@ -29,18 +31,10 @@
  public:
   // AppCacheResponseInfo takes ownership of the http_info.
   AppCacheResponseInfo(AppCacheService* service, int64 response_id,
-                       net::HttpResponseInfo* http_info)
-      : response_id_(response_id), http_response_info_(http_info),
-        service_(service) {
-    DCHECK(http_info);
-    DCHECK(response_id != kNoResponseId);
-    service_->storage()->working_set()->AddResponseInfo(this);
-  }
+                       net::HttpResponseInfo* http_info);
+  ~AppCacheResponseInfo();
+  // TODO(michaeln): should the ctor/dtor be hidden from public view?
 
-  ~AppCacheResponseInfo() {
-    service_->storage()->working_set()->RemoveResponseInfo(this);
-  }
-
   int64 response_id() const { return response_id_; }
 
   const net::HttpResponseInfo* http_response_info() const {
@@ -53,24 +47,48 @@
   const AppCacheService* service_;
 };
 
+// A refcounted wrapper for HttpResponseInfo so we can apply the
+// refcounting semantics used with IOBuffer with these structures too.
+struct HttpResponseInfoIOBuffer
+    : public base::RefCountedThreadSafe<HttpResponseInfoIOBuffer> {
+  scoped_ptr<net::HttpResponseInfo> http_info;
+
+  HttpResponseInfoIOBuffer() {}
+  HttpResponseInfoIOBuffer(net::HttpResponseInfo* info) : http_info(info) {}
+};
+
 // Common base class for response reader and writer.
 class AppCacheResponseIO {
  public:
-  virtual ~AppCacheResponseIO() {}
+  virtual ~AppCacheResponseIO();
   int64 response_id() const { return response_id_; }
+
  protected:
-  explicit AppCacheResponseIO(
-      int64 response_id, disk_cache::Backend* disk_cache)
-      : response_id_(response_id), disk_cache_(disk_cache) {}
+  friend class ScopedRunnableMethodFactory<AppCacheResponseIO>;
+
+  AppCacheResponseIO(int64 response_id, disk_cache::Backend* disk_cache);
+
+  virtual void OnIOComplete(int result) = 0;
+
+  bool IsIOPending() { return user_callback_ ? true : false; }
+  void ScheduleIOCompletionCallback(int result);
+  void InvokeUserCompletionCallback(int result);
+  void ReadRaw(int index, int offset, net::IOBuffer* buf, int buf_len);
+  void WriteRaw(int index, int offset, net::IOBuffer* buf, int buf_len);
+
   const int64 response_id_;
   disk_cache::Backend* disk_cache_;
-};
+  disk_cache::Entry* entry_;
+  scoped_refptr<HttpResponseInfoIOBuffer> info_buffer_;
+  scoped_refptr<net::IOBuffer> buffer_;
+  net::CompletionCallback* user_callback_;
 
-// A refcounted wrapper for HttpResponseInfo so we can apply the
-// refcounting semantics used with IOBuffer with these structures too.
-struct HttpResponseInfoIOBuffer
-    : public base::RefCountedThreadSafe<HttpResponseInfoIOBuffer> {
-  scoped_ptr<net::HttpResponseInfo> http_info;
+ private:
+  void OnRawIOComplete(int result);
+
+  ScopedRunnableMethodFactory<AppCacheResponseIO> method_factory_;
+  scoped_refptr<net::CancelableCompletionCallback<AppCacheResponseIO> >
+      raw_callback_;
 };
 
 // Reads existing response data from storage. If the object is deleted
@@ -79,55 +97,52 @@
 // operation.  In other words, instances are safe to delete at will.
 class AppCacheResponseReader : public AppCacheResponseIO {
  public:
-  // Reads http info from storage. Returns the number of bytes read
+  // Reads http info from storage. Always returns the result of the read
+  // asynchronously through the 'callback'. Returns the number of bytes read
   // or a net:: error code. Guaranteed to not perform partial reads of
-  // the info data. ERR_IO_PENDING is returned if the
-  // operation could not be completed synchronously, in which case the reader
-  // acquires a reference to the provided 'info_buf' until completion at which
-  // time the callback is invoked with either a negative error code or the
-  // number of bytes written. The 'info_buf' argument should contain a NULL
-  // http_info when ReadInfo is called. The 'callback' is a required parameter.
+  // the info data. The reader acquires a reference to the 'info_buf' until
+  // completion at which time the callback is invoked with either a negative
+  // error code or the number of bytes read. The 'info_buf' argument should
+  // contain a NULL http_info when ReadInfo is called. The 'callback' is a
+  // required parameter.
   // Should only be called where there is no Read operation in progress.
-  int ReadInfo(HttpResponseInfoIOBuffer* info_buf,
-               net::CompletionCallback* callback) {
-    DCHECK(info_buf && !info_buf->http_info.get());
-    return -2;
-  }
+  void ReadInfo(HttpResponseInfoIOBuffer* info_buf,
+                net::CompletionCallback* callback);
 
-  // Reads data from storage. Returns the number of bytes read
+  // Reads data from storage. Always returns the result of the read
+  // asynchronously through the 'callback'. Returns the number of bytes read
   // or a net:: error code. EOF is indicated with a return value of zero.
-  // ERR_IO_PENDING is returned if the operation could not be completed
-  // synchronously, in which case the reader acquires a reference to the
-  // provided 'buf' until completion at which time the callback is invoked
-  // with either a negative error code or the number of bytes read. The
-  // 'callback' is a required parameter.
+  // The reader acquires a reference to the provided 'buf' until completion
+  // at which time the callback is invoked with either a negative error code
+  // or the number of bytes read. The 'callback' is a required parameter.
   // Should only be called where there is no Read operation in progress.
-  int ReadData(net::IOBuffer* buf, int buf_len,
-               net::CompletionCallback* callback) { return -2; }
+  void ReadData(net::IOBuffer* buf, int buf_len,
+                net::CompletionCallback* callback);
 
   // Returns true if there is a read operation, for data or info, pending.
-  bool IsReadPending() { return false; }
+  bool IsReadPending() { return IsIOPending(); }
 
   // Used to support range requests. If not called, the reader will
   // read the entire response body. If called, this must be called prior
   // to the first call to the ReadData method.
-  void SetReadRange(int64 offset, int64 length) {
-    range_offset_ = offset;
-    range_length_ = length;
-  }
+  void SetReadRange(int offset, int length);
 
  private:
   friend class AppCacheStorageImpl;
   friend class MockAppCacheStorage;
 
   // Should only be constructed by the storage class.
-  explicit AppCacheResponseReader(
-      int64 response_id, disk_cache::Backend* disk_cache)
+  AppCacheResponseReader(int64 response_id, disk_cache::Backend* disk_cache)
       : AppCacheResponseIO(response_id, disk_cache),
-        range_offset_(0), range_length_(kint64max) {}
+        range_offset_(0), range_length_(kint32max),
+        read_position_(0) {}
 
-  int64 range_offset_;
-  int64 range_length_;
+  virtual void OnIOComplete(int result);
+  bool OpenEntryIfNeeded();
+
+  int range_offset_;
+  int range_length_;
+  int read_position_;
 };
 
 // Writes new response data to storage. If the object is deleted
@@ -136,43 +151,44 @@
 // operation. In other words, instances are safe to delete at will.
 class AppCacheResponseWriter : public AppCacheResponseIO {
  public:
-  // Writes the http info to storage. Returns the number of bytes written
-  // or a net:: error code. ERR_IO_PENDING is returned if the
-  // operation could not be completed synchronously, in which case the writer
-  // acquires a reference to the provided 'info_buf' until completion at which
-  // time the callback is invoked with either a negative error code or the
-  // number of bytes written. The 'callback' is a required parameter. The
-  // contents of 'info_buf' are not modified.
+  // Writes the http info to storage. Always returns the result of the write
+  // asynchronously through the 'callback'. Returns the number of bytes written
+  // or a net:: error code. The writer acquires a reference to the 'info_buf'
+  // until completion at which time the callback is invoked with either a
+  // negative error code or the number of bytes written. The 'callback' is a
+  // required parameter. The contents of 'info_buf' are not modified.
   // Should only be called where there is no Write operation in progress.
-  int WriteInfo(HttpResponseInfoIOBuffer* info_buf,
-                net::CompletionCallback* callback) {
-    DCHECK(info_buf && info_buf->http_info.get());
-    return -2;
-  }
+  void WriteInfo(HttpResponseInfoIOBuffer* info_buf,
+                 net::CompletionCallback* callback);
 
-  // Writes data to storage. Returns the number of bytes written
+  // Writes data to storage. Always returns the result of the write
+  // asynchronously through the 'callback'. Returns the number of bytes written
   // or a net:: error code. Guaranteed to not perform partial writes.
-  // ERR_IO_PENDING is returned if the operation could not be completed
-  // synchronously, in which case the writer acquires a reference to the
-  // provided 'buf' until completion at which time the callback is invoked
-  // with either a negative error code or the number of bytes written. The
-  // 'callback' is a required parameter. The contents of 'buf' are not
-  // modified.
+  // The writer acquires a reference to the provided 'buf' until completion at
+  // which time the callback is invoked with either a negative error code or
+  //  the number of bytes written. The 'callback' is a required parameter.
+  // The contentsof 'buf' are not modified.
   // Should only be called where there is no Write operation in progress.
-  int WriteData(net::IOBuffer* buf, int buf_len,
-                net::CompletionCallback* callback) { return -2; }
+  void WriteData(net::IOBuffer* buf, int buf_len,
+                 net::CompletionCallback* callback);
 
   // Returns true if there is a write pending.
-  bool IsWritePending() { return false; }
+  bool IsWritePending() { return IsIOPending(); }
 
  private:
   friend class AppCacheStorageImpl;
   friend class MockAppCacheStorage;
 
   // Should only be constructed by the storage class.
-  explicit AppCacheResponseWriter(
-      int64 response_id, disk_cache::Backend* disk_cache)
-      : AppCacheResponseIO(response_id, disk_cache) {}
+  AppCacheResponseWriter(int64 response_id, disk_cache::Backend* disk_cache)
+      : AppCacheResponseIO(response_id, disk_cache),
+        write_position_(0), write_amount_(0) {}
+
+  virtual void OnIOComplete(int result);
+  bool CreateEntryIfNeeded();
+
+  int write_position_;
+  int write_amount_;
 };
 
 }  // namespace appcache