| Index: net/http/http_cache_transaction.h
|
| diff --git a/net/http/http_cache_transaction.h b/net/http/http_cache_transaction.h
|
| index aeef83e9b9c595b09a709dd521dcc9f56f11d7a0..1c9a6edf3e825093b4918859a5d190090114d755 100644
|
| --- a/net/http/http_cache_transaction.h
|
| +++ b/net/http/http_cache_transaction.h
|
| @@ -49,17 +49,16 @@ class HttpCache::Transaction : public HttpTransaction {
|
| // update existing cache entries, but will never create a new entry or
|
| // respond using the entry read from the cache.
|
| enum Mode {
|
| - NONE = 0,
|
| - READ_META = 1 << 0,
|
| - READ_DATA = 1 << 1,
|
| - READ = READ_META | READ_DATA,
|
| - WRITE = 1 << 2,
|
| - READ_WRITE = READ | WRITE,
|
| - UPDATE = READ_META | WRITE, // READ_WRITE & ~READ_DATA
|
| + NONE = 0,
|
| + READ_META = 1 << 0,
|
| + READ_DATA = 1 << 1,
|
| + READ = READ_META | READ_DATA,
|
| + WRITE = 1 << 2,
|
| + READ_WRITE = READ | WRITE,
|
| + UPDATE = READ_META | WRITE, // READ_WRITE & ~READ_DATA
|
| };
|
|
|
| - Transaction(RequestPriority priority,
|
| - HttpCache* cache);
|
| + Transaction(RequestPriority priority, HttpCache* cache);
|
| virtual ~Transaction();
|
|
|
| Mode mode() const { return mode_; }
|
| @@ -330,7 +329,10 @@ class HttpCache::Transaction : public HttpTransaction {
|
| // Called to write data to the cache entry. If the write fails, then the
|
| // cache entry is destroyed. Future calls to this function will just do
|
| // nothing without side-effect. Returns a network error code.
|
| - int WriteToEntry(int index, int offset, IOBuffer* data, int data_len,
|
| + int WriteToEntry(int index,
|
| + int offset,
|
| + IOBuffer* data,
|
| + int data_len,
|
| const CompletionCallback& callback);
|
|
|
| // Called to write response_ to the cache entry. |truncated| indicates if the
|
| @@ -339,7 +341,8 @@ class HttpCache::Transaction : public HttpTransaction {
|
|
|
| // Called to append response data to the cache entry. Returns a network error
|
| // code.
|
| - int AppendResponseDataToEntry(IOBuffer* data, int data_len,
|
| + int AppendResponseDataToEntry(IOBuffer* data,
|
| + int data_len,
|
| const CompletionCallback& callback);
|
|
|
| // Called when we are done writing to the cache entry.
|
| @@ -403,14 +406,14 @@ class HttpCache::Transaction : public HttpTransaction {
|
| Mode mode_;
|
| State target_state_;
|
| bool reading_; // We are already reading. Never reverts to false once set.
|
| - bool invalid_range_; // We may bypass the cache for this request.
|
| - bool truncated_; // We don't have all the response data.
|
| - bool is_sparse_; // The data is stored in sparse byte ranges.
|
| + bool invalid_range_; // We may bypass the cache for this request.
|
| + bool truncated_; // We don't have all the response data.
|
| + bool is_sparse_; // The data is stored in sparse byte ranges.
|
| bool range_requested_; // The user requested a byte range.
|
| - bool handling_206_; // We must deal with this 206 response.
|
| - bool cache_pending_; // We are waiting for the HttpCache.
|
| - bool done_reading_; // All available data was read.
|
| - bool vary_mismatch_; // The request doesn't match the stored vary data.
|
| + bool handling_206_; // We must deal with this 206 response.
|
| + bool cache_pending_; // We are waiting for the HttpCache.
|
| + bool done_reading_; // All available data was read.
|
| + bool vary_mismatch_; // The request doesn't match the stored vary data.
|
| bool couldnt_conditionalize_request_;
|
| scoped_refptr<IOBuffer> read_buf_;
|
| int io_buf_len_;
|
|
|