Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(444)

Side by Side Diff: net/http/http_cache.cc

Issue 2671793002: Correct handling of ERR_CACHE_LOCK_TIMEOUT for read only transactions. (Closed)
Patch Set: Feedback addressed. Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « net/http/http_cache.h ('k') | net/http/http_cache_transaction.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/http/http_cache.h" 5 #include "net/http/http_cache.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after
223 223
224 void HttpCache::MetadataWriter::Write(const GURL& url, 224 void HttpCache::MetadataWriter::Write(const GURL& url,
225 base::Time expected_response_time, 225 base::Time expected_response_time,
226 IOBuffer* buf, 226 IOBuffer* buf,
227 int buf_len) { 227 int buf_len) {
228 DCHECK_GT(buf_len, 0); 228 DCHECK_GT(buf_len, 0);
229 DCHECK(buf); 229 DCHECK(buf);
230 DCHECK(buf->data()); 230 DCHECK(buf->data());
231 request_info_.url = url; 231 request_info_.url = url;
232 request_info_.method = "GET"; 232 request_info_.method = "GET";
233
234 // todo (crbug.com/690099): Incorrect usage of LOAD_ONLY_FROM_CACHE.
233 request_info_.load_flags = 235 request_info_.load_flags =
234 LOAD_ONLY_FROM_CACHE | LOAD_SKIP_CACHE_VALIDATION | LOAD_SKIP_VARY_CHECK; 236 LOAD_ONLY_FROM_CACHE | LOAD_SKIP_CACHE_VALIDATION | LOAD_SKIP_VARY_CHECK;
235 237
236 expected_response_time_ = expected_response_time; 238 expected_response_time_ = expected_response_time;
237 buf_ = buf; 239 buf_ = buf;
238 buf_len_ = buf_len; 240 buf_len_ = buf_len;
239 verified_ = false; 241 verified_ = false;
240 242
241 int rv = transaction_->Start( 243 int rv = transaction_->Start(
242 &request_info_, 244 &request_info_,
(...skipping 911 matching lines...) Expand 10 before | Expand all | Expand 10 after
1154 building_backend_ = false; 1156 building_backend_ = false;
1155 DeletePendingOp(pending_op); 1157 DeletePendingOp(pending_op);
1156 } 1158 }
1157 1159
1158 // The cache may be gone when we return from the callback. 1160 // The cache may be gone when we return from the callback.
1159 if (!item->DoCallback(result, disk_cache_.get())) 1161 if (!item->DoCallback(result, disk_cache_.get()))
1160 item->NotifyTransaction(result, NULL); 1162 item->NotifyTransaction(result, NULL);
1161 } 1163 }
1162 1164
1163 } // namespace net 1165 } // namespace net
OLDNEW
« no previous file with comments | « net/http/http_cache.h ('k') | net/http/http_cache_transaction.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698