diff options
Diffstat (limited to 'webkit/appcache/appcache_storage_impl.cc')
-rw-r--r-- | webkit/appcache/appcache_storage_impl.cc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/webkit/appcache/appcache_storage_impl.cc b/webkit/appcache/appcache_storage_impl.cc index 051d276..b853a0c 100644 --- a/webkit/appcache/appcache_storage_impl.cc +++ b/webkit/appcache/appcache_storage_impl.cc @@ -844,8 +844,10 @@ AppCacheStorageImpl::~AppCacheStorageImpl() { AppCacheThread::DeleteSoon(AppCacheThread::db(), FROM_HERE, database_); } -void AppCacheStorageImpl::Initialize(const FilePath& cache_directory) { +void AppCacheStorageImpl::Initialize(const FilePath& cache_directory, + base::MessageLoopProxy* cache_thread) { cache_directory_ = cache_directory; + cache_thread_ = cache_thread; is_incognito_ = cache_directory_.empty(); FilePath db_file_path; @@ -1273,9 +1275,12 @@ AppCacheDiskCache* AppCacheStorageImpl::disk_cache() { } else { rv = disk_cache_->InitWithDiskBackend( cache_directory_.Append(kDiskCacheDirectoryName), - kMaxDiskCacheSize, false, &init_callback_); + kMaxDiskCacheSize, false, cache_thread_, &init_callback_); } + // We should not keep this reference around. + cache_thread_ = NULL; + if (rv != net::ERR_IO_PENDING) OnDiskCacheInitialized(rv); } |