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

Unified Diff: net/http/http_cache.cc

Issue 4067002: First pass at adding http/backend cache to NetLog (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Lint fixes Created 9 years, 12 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/http/http_cache.h ('k') | net/http/http_cache_transaction.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/http/http_cache.cc
===================================================================
--- net/http/http_cache.cc (revision 70512)
+++ net/http/http_cache.cc (working copy)
@@ -55,17 +55,18 @@
return new DefaultBackend(MEMORY_CACHE, FilePath(), max_bytes, NULL);
}
-int HttpCache::DefaultBackend::CreateBackend(disk_cache::Backend** backend,
+int HttpCache::DefaultBackend::CreateBackend(NetLog* net_log,
+ disk_cache::Backend** backend,
CompletionCallback* callback) {
DCHECK_GE(max_bytes_, 0);
return disk_cache::CreateCacheBackend(type_, path_, max_bytes_, true,
- thread_, backend, callback);
+ thread_, net_log, backend, callback);
}
//-----------------------------------------------------------------------------
-HttpCache::ActiveEntry::ActiveEntry(disk_cache::Entry* e)
- : disk_entry(e),
+HttpCache::ActiveEntry::ActiveEntry(disk_cache::Entry* entry)
+ : disk_entry(entry),
writer(NULL),
will_process_pending_queue(false),
doomed(false) {
@@ -288,7 +289,8 @@
HttpNetworkDelegate* network_delegate,
NetLog* net_log,
BackendFactory* backend_factory)
- : backend_factory_(backend_factory),
+ : net_log_(net_log),
+ backend_factory_(backend_factory),
building_backend_(false),
mode_(NORMAL),
ssl_host_info_factory_(new SSLHostInfoFactoryAdaptor(
@@ -303,7 +305,8 @@
HttpCache::HttpCache(HttpNetworkSession* session,
BackendFactory* backend_factory)
- : backend_factory_(backend_factory),
+ : net_log_(session->net_log()),
+ backend_factory_(backend_factory),
building_backend_(false),
mode_(NORMAL),
network_layer_(HttpNetworkLayer::CreateFactory(session)),
@@ -311,8 +314,10 @@
}
HttpCache::HttpCache(HttpTransactionFactory* network_layer,
+ NetLog* net_log,
BackendFactory* backend_factory)
- : backend_factory_(backend_factory),
+ : net_log_(net_log),
+ backend_factory_(backend_factory),
building_backend_(false),
mode_(NORMAL),
network_layer_(network_layer),
@@ -464,7 +469,8 @@
BackendCallback* my_callback = new BackendCallback(this, pending_op);
pending_op->callback = my_callback;
- int rv = backend_factory_->CreateBackend(&pending_op->backend, my_callback);
+ int rv = backend_factory_->CreateBackend(net_log_, &pending_op->backend,
+ my_callback);
if (rv != ERR_IO_PENDING) {
pending_op->writer->ClearCallback();
my_callback->Run(rv);
« no previous file with comments | « net/http/http_cache.h ('k') | net/http/http_cache_transaction.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698