diff options
| author | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-07 14:15:36 +0000 |
|---|---|---|
| committer | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-07 14:15:36 +0000 |
| commit | 2c5c9d596ad422529c88b47db2b60eff9410cde0 (patch) | |
| tree | 0625f8f8cb92d6c5ec93efb6892beb13bc6a43bb /net/disk_cache/entry_impl.h | |
| parent | 4ba14e1044e2e837a8c81894df156e4fd4be86bd (diff) | |
| download | chromium_src-2c5c9d596ad422529c88b47db2b60eff9410cde0.zip chromium_src-2c5c9d596ad422529c88b47db2b60eff9410cde0.tar.gz chromium_src-2c5c9d596ad422529c88b47db2b60eff9410cde0.tar.bz2 | |
Reverts a commit that caused ASAN failures, and 2 dependent commits.
The primary commit was 113249, the dependents were 113261, 113263.
This is a speculative revert, r113249 is by far the likeliest culprit in the blamelist of build http://build.chromium.org/p/chromium.memory/builders/ASAN%20Tests%20%282%29/builds/2325 which is where we started seeing the ASAN failures in question, will un-revert if it does not fix the problem.
TBR=jhawkins@chromium.org
BUG=none
Review URL: http://codereview.chromium.org/8832006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113387 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/disk_cache/entry_impl.h')
| -rw-r--r-- | net/disk_cache/entry_impl.h | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/net/disk_cache/entry_impl.h b/net/disk_cache/entry_impl.h index 6ff7152..62ec9d7 100644 --- a/net/disk_cache/entry_impl.h +++ b/net/disk_cache/entry_impl.h @@ -41,12 +41,8 @@ class NET_EXPORT_PRIVATE EntryImpl void DoomImpl(); int ReadDataImpl(int index, int offset, net::IOBuffer* buf, int buf_len, OldCompletionCallback* callback); - int ReadDataImpl(int index, int offset, net::IOBuffer* buf, int buf_len, - const net::CompletionCallback& callback); int WriteDataImpl(int index, int offset, net::IOBuffer* buf, int buf_len, OldCompletionCallback* callback, bool truncate); - int WriteDataImpl(int index, int offset, net::IOBuffer* buf, int buf_len, - const net::CompletionCallback& callback, bool truncate); int ReadSparseDataImpl(int64 offset, net::IOBuffer* buf, int buf_len, OldCompletionCallback* callback); int WriteSparseDataImpl(int64 offset, net::IOBuffer* buf, int buf_len, @@ -153,15 +149,9 @@ class NET_EXPORT_PRIVATE EntryImpl virtual int ReadData( int index, int offset, net::IOBuffer* buf, int buf_len, net::OldCompletionCallback* completion_callback) OVERRIDE; - virtual int ReadData( - int index, int offset, net::IOBuffer* buf, int buf_len, - const net::CompletionCallback& completion_callback) OVERRIDE; virtual int WriteData(int index, int offset, net::IOBuffer* buf, int buf_len, net::OldCompletionCallback* completion_callback, bool truncate) OVERRIDE; - virtual int WriteData(int index, int offset, net::IOBuffer* buf, int buf_len, - const net::CompletionCallback& completion_callback, - bool truncate) OVERRIDE; virtual int ReadSparseData( int64 offset, net::IOBuffer* buf, int buf_len, net::OldCompletionCallback* completion_callback) OVERRIDE; @@ -187,12 +177,8 @@ class NET_EXPORT_PRIVATE EntryImpl // separate functions to make logging of results simpler. int InternalReadData(int index, int offset, net::IOBuffer* buf, int buf_len, OldCompletionCallback* callback); - int InternalReadData(int index, int offset, net::IOBuffer* buf, - int buf_len, const net::CompletionCallback& callback); int InternalWriteData(int index, int offset, net::IOBuffer* buf, int buf_len, OldCompletionCallback* callback, bool truncate); - int InternalWriteData(int index, int offset, net::IOBuffer* buf, int buf_len, - const net::CompletionCallback& callback, bool truncate); // Initializes the storage for an internal or external data block. bool CreateDataBlock(int index, int size); |