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

Unified Diff: net/disk_cache/entry_impl.cc

Issue 113931: Remove code path that passes a file handle to the renderer... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 7 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/entry_impl.h ('k') | net/disk_cache/entry_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/disk_cache/entry_impl.cc
===================================================================
--- net/disk_cache/entry_impl.cc (revision 17048)
+++ net/disk_cache/entry_impl.cc (working copy)
@@ -81,7 +81,6 @@
backend_ = backend;
for (int i = 0; i < NUM_STREAMS; i++) {
unreported_size_[i] = 0;
- need_file_[i] = false;
}
}
@@ -303,9 +302,7 @@
backend_->OnEvent(Stats::WRITE_DATA);
- // If we have prepared the cache as an external file, we should never use
- // user_buffers_ and always write to file directly.
- if (!need_file_[index] && user_buffers_[index].get()) {
+ if (user_buffers_[index].get()) {
// Complete the operation locally.
if (!buf_len)
return 0;
@@ -354,43 +351,6 @@
return (completed || !completion_callback) ? buf_len : net::ERR_IO_PENDING;
}
-base::PlatformFile EntryImpl::UseExternalFile(int index) {
- DCHECK(index >= 0 && index < NUM_STREAMS);
-
- Addr address(entry_.Data()->data_addr[index]);
-
- // We will not prepare the cache file since the entry is already initialized,
- // just return the platform file backing the cache.
- if (address.is_initialized())
- return GetPlatformFile(index);
-
- if (!backend_->CreateExternalFile(&address))
- return base::kInvalidPlatformFileValue;
-
- entry_.Data()->data_addr[index] = address.value();
- entry_.Store();
-
- // Set the flag for this stream so we never use user_buffer_.
- // TODO(hclam): do we need to save this information to EntryStore?
- need_file_[index] = true;
-
- return GetPlatformFile(index);
-}
-
-base::PlatformFile EntryImpl::GetPlatformFile(int index) {
- DCHECK(index >= 0 && index < NUM_STREAMS);
-
- Addr address(entry_.Data()->data_addr[index]);
- if (!address.is_initialized() || !address.is_separate_file())
- return base::kInvalidPlatformFileValue;
-
- return base::CreatePlatformFile(backend_->GetFileName(address),
- base::PLATFORM_FILE_OPEN |
- base::PLATFORM_FILE_READ |
- base::PLATFORM_FILE_ASYNC,
- NULL);
-}
-
uint32 EntryImpl::GetHash() {
return entry_.Data()->hash;
}
@@ -675,15 +635,6 @@
bool truncate) {
Addr address(entry_.Data()->data_addr[index]);
- // If we are instructed to use an external file, we should never buffer when
- // writing. We are done with preparation of the target automatically, since
- // we have already created the external file for writing.
- if (need_file_[index]) {
- // Make sure the stream is initialized and is kept in an external file.
- DCHECK(address.is_initialized() && address.is_separate_file());
- return true;
- }
-
if (address.is_initialized() || user_buffers_[index].get())
return GrowUserBuffer(index, offset, buf_len, truncate);
« no previous file with comments | « net/disk_cache/entry_impl.h ('k') | net/disk_cache/entry_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698