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

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

Issue 761763003: Do not call GenerateCacheKey() if disk cache is disabled. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Do not call GenerateCacheKey() if disk cache is disabled. Created 6 years 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 | « no previous file | no next file » | 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 8
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 10
(...skipping 585 matching lines...) Expand 10 before | Expand all | Expand 10 after
596 } 596 }
597 597
598 void HttpCache::CloseIdleConnections() { 598 void HttpCache::CloseIdleConnections() {
599 HttpNetworkSession* session = GetSession(); 599 HttpNetworkSession* session = GetSession();
600 if (session) 600 if (session)
601 session->CloseIdleConnections(); 601 session->CloseIdleConnections();
602 } 602 }
603 603
604 void HttpCache::OnExternalCacheHit(const GURL& url, 604 void HttpCache::OnExternalCacheHit(const GURL& url,
605 const std::string& http_method) { 605 const std::string& http_method) {
606 if (!disk_cache_.get()) 606 if (!disk_cache_.get() || mode_ == DISABLE)
607 return; 607 return;
608 608
609 HttpRequestInfo request_info; 609 HttpRequestInfo request_info;
610 request_info.url = url; 610 request_info.url = url;
611 request_info.method = http_method; 611 request_info.method = http_method;
612 std::string key = GenerateCacheKey(&request_info); 612 std::string key = GenerateCacheKey(&request_info);
613 disk_cache_->OnExternalCacheHit(key); 613 disk_cache_->OnExternalCacheHit(key);
614 } 614 }
615 615
616 void HttpCache::InitializeInfiniteCache(const base::FilePath& path) { 616 void HttpCache::InitializeInfiniteCache(const base::FilePath& path) {
(...skipping 789 matching lines...) Expand 10 before | Expand all | Expand 10 after
1406 building_backend_ = false; 1406 building_backend_ = false;
1407 DeletePendingOp(pending_op); 1407 DeletePendingOp(pending_op);
1408 } 1408 }
1409 1409
1410 // The cache may be gone when we return from the callback. 1410 // The cache may be gone when we return from the callback.
1411 if (!item->DoCallback(result, disk_cache_.get())) 1411 if (!item->DoCallback(result, disk_cache_.get()))
1412 item->NotifyTransaction(result, NULL); 1412 item->NotifyTransaction(result, NULL);
1413 } 1413 }
1414 1414
1415 } // namespace net 1415 } // namespace net
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698