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

Unified Diff: net/disk_cache/mem_entry_impl.cc

Issue 8832006: Reverts a commit that caused ASAN failures, and 2 dependent commits. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/disk_cache/mem_entry_impl.h ('k') | net/http/disk_cache_based_ssl_host_info.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/disk_cache/mem_entry_impl.cc
diff --git a/net/disk_cache/mem_entry_impl.cc b/net/disk_cache/mem_entry_impl.cc
index 487476121e49adb855970273a01177c3119b7d86..677cd6ae7702875f2e3eff1d392939efefc323de 100644
--- a/net/disk_cache/mem_entry_impl.cc
+++ b/net/disk_cache/mem_entry_impl.cc
@@ -185,26 +185,6 @@ int MemEntryImpl::ReadData(int index, int offset, net::IOBuffer* buf,
return result;
}
-int MemEntryImpl::ReadData(
- int index, int offset, net::IOBuffer* buf, int buf_len,
- const net::CompletionCallback& completion_callback) {
- if (net_log_.IsLoggingAllEvents()) {
- net_log_.BeginEvent(
- net::NetLog::TYPE_ENTRY_READ_DATA,
- make_scoped_refptr(
- new ReadWriteDataParameters(index, offset, buf_len, false)));
- }
-
- int result = InternalReadData(index, offset, buf, buf_len);
-
- if (net_log_.IsLoggingAllEvents()) {
- net_log_.EndEvent(
- net::NetLog::TYPE_ENTRY_READ_DATA,
- make_scoped_refptr(new ReadWriteCompleteParameters(result)));
- }
- return result;
-}
-
int MemEntryImpl::WriteData(int index, int offset, net::IOBuffer* buf,
int buf_len, net::OldCompletionCallback* completion_callback, bool truncate) {
if (net_log_.IsLoggingAllEvents()) {
@@ -224,26 +204,6 @@ int MemEntryImpl::WriteData(int index, int offset, net::IOBuffer* buf,
return result;
}
-int MemEntryImpl::WriteData(
- int index, int offset, net::IOBuffer* buf, int buf_len,
- const net::CompletionCallback& completion_callback, bool truncate) {
- if (net_log_.IsLoggingAllEvents()) {
- net_log_.BeginEvent(
- net::NetLog::TYPE_ENTRY_WRITE_DATA,
- make_scoped_refptr(
- new ReadWriteDataParameters(index, offset, buf_len, truncate)));
- }
-
- int result = InternalWriteData(index, offset, buf, buf_len, truncate);
-
- if (net_log_.IsLoggingAllEvents()) {
- net_log_.EndEvent(
- net::NetLog::TYPE_ENTRY_WRITE_DATA,
- make_scoped_refptr(new ReadWriteCompleteParameters(result)));
- }
- return result;
-}
-
int MemEntryImpl::ReadSparseData(int64 offset, net::IOBuffer* buf, int buf_len,
net::OldCompletionCallback* completion_callback) {
if (net_log_.IsLoggingAllEvents()) {
« no previous file with comments | « net/disk_cache/mem_entry_impl.h ('k') | net/http/disk_cache_based_ssl_host_info.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698