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

Unified Diff: net/disk_cache/sparse_control.cc

Issue 2881010: Revert 51456 - Disk cache: Switch the disk cache to use the cache_thread.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 6 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/disk_cache/in_flight_io.cc ('k') | net/disk_cache/stress_cache.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/disk_cache/sparse_control.cc
===================================================================
--- net/disk_cache/sparse_control.cc (revision 51468)
+++ net/disk_cache/sparse_control.cc (working copy)
@@ -126,7 +126,7 @@
return Release();
}
std::string child_name = GenerateChildName(name_, signature_, child_id);
- backend_->SyncDoomEntry(child_name);
+ backend_->DoomEntry(child_name);
children_map_.Set(child_id, false);
// Post a task to delete the next child.
@@ -373,7 +373,7 @@
CloseChild();
}
- // See if we are tracking this child.
+ // Se if we are tracking this child.
if (!ChildPresent())
return ContinueWithoutChild(key);
@@ -418,7 +418,7 @@
NULL, false);
if (rv != sizeof(child_data_))
DLOG(ERROR) << "Failed to save child data";
- child_->Release();
+ child_->Close();
child_ = NULL;
}
@@ -430,8 +430,8 @@
// We are deleting the child because something went wrong.
bool SparseControl::KillChildAndContinue(const std::string& key, bool fatal) {
SetChildBit(false);
- child_->DoomImpl();
- child_->Release();
+ child_->Doom();
+ child_->Close();
child_ = NULL;
if (fatal) {
result_ = net::ERR_CACHE_READ_FAILURE;
@@ -617,12 +617,12 @@
int rv = 0;
switch (operation_) {
case kReadOperation:
- rv = child_->ReadDataImpl(kSparseData, child_offset_, user_buf_,
- child_len_, callback);
+ rv = child_->ReadData(kSparseData, child_offset_, user_buf_, child_len_,
+ callback);
break;
case kWriteOperation:
- rv = child_->WriteDataImpl(kSparseData, child_offset_, user_buf_,
- child_len_, callback, false);
+ rv = child_->WriteData(kSparseData, child_offset_, user_buf_, child_len_,
+ callback, false);
break;
case kGetRangeOperation:
rv = DoGetAvailableRange();
« no previous file with comments | « net/disk_cache/in_flight_io.cc ('k') | net/disk_cache/stress_cache.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698