summaryrefslogtreecommitdiffstats
path: root/webkit/appcache
diff options
context:
space:
mode:
authorestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-07 00:39:04 +0000
committerestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-07 00:39:04 +0000
commita6ec0897e904792a60a12a58b26dd2214dbcfa39 (patch)
treec0040197acf7510b074af818ef8335b832e22e25 /webkit/appcache
parent1b4209f4c56fbdb6fe72aca508e8aa1c534964d4 (diff)
downloadchromium_src-a6ec0897e904792a60a12a58b26dd2214dbcfa39.zip
chromium_src-a6ec0897e904792a60a12a58b26dd2214dbcfa39.tar.gz
chromium_src-a6ec0897e904792a60a12a58b26dd2214dbcfa39.tar.bz2
Revert r70628. It broke Linux valgrind bots. See for example
http://build.chromium.org/p/chromium.memory/builders/Linux%20Tests%20%28valgrind%29%281%29/builds/963 First pass at adding http/backend cache events to the NetLog. Adds sources and events for ActiveCacheEntry and EntryImpl objects, as well as adding cache read/write events to HttpCacheTransactions. Most new read/write events are only logged when NetLog logging mode is set to log all events. Also, net-internals now merges begin and end events that have parameters, as long as only one of them has parameters. I think this increases readability, at the cost of making it a little more difficult to follow timings with just the "st" values. BUG=59382 TEST=none yet, other than updates to existing tests. Originally applied: http://src.chromium.org/viewvc/chrome?view=rev&revision=70618 Reverted: http://src.chromium.org/viewvc/chrome?view=rev&revision=70619 Fixed and trying again... Review URL: http://codereview.chromium.org/6125001 BUG=none TEST=linux valgrind goes green. Review URL: http://codereview.chromium.org/6142003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70688 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/appcache')
-rw-r--r--webkit/appcache/appcache_disk_cache.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/webkit/appcache/appcache_disk_cache.cc b/webkit/appcache/appcache_disk_cache.cc
index 9aa0280..dbba211 100644
--- a/webkit/appcache/appcache_disk_cache.cc
+++ b/webkit/appcache/appcache_disk_cache.cc
@@ -108,7 +108,7 @@ int AppCacheDiskCache::Init(net::CacheType cache_type,
this, &AppCacheDiskCache::OnCreateBackendComplete);
int rv = disk_cache::CreateCacheBackend(
- cache_type, cache_directory, cache_size, force, cache_thread, NULL,
+ cache_type, cache_directory, cache_size, force, cache_thread,
&(create_backend_callback_->backend_ptr_), create_backend_callback_);
if (rv == net::ERR_IO_PENDING)
init_callback_ = callback;