diff options
author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-19 16:17:03 +0000 |
---|---|---|
committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-19 16:17:03 +0000 |
commit | b15fe20691381d4c5c523f9a214d640e1462f59e (patch) | |
tree | 93c457edbd7408d128800eb3a26027a54d0b0883 /base | |
parent | 22b9e14d471b04e4a6b238bcd1027c59ff33dc95 (diff) | |
download | chromium_src-b15fe20691381d4c5c523f9a214d640e1462f59e.zip chromium_src-b15fe20691381d4c5c523f9a214d640e1462f59e.tar.gz chromium_src-b15fe20691381d4c5c523f9a214d640e1462f59e.tar.bz2 |
Revert r39446: "Fix the case where the browser livelocks if we cannot open a file."
This somehow broke net_unittests on the Mac.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39448 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
-rw-r--r-- | base/platform_file.h | 37 | ||||
-rw-r--r-- | base/platform_file_posix.cc | 8 | ||||
-rw-r--r-- | base/platform_file_win.cc | 8 |
3 files changed, 0 insertions, 53 deletions
diff --git a/base/platform_file.h b/base/platform_file.h index 4ab1ace..0dbf4e4 100644 --- a/base/platform_file.h +++ b/base/platform_file.h @@ -12,8 +12,6 @@ #include <string> -#include "base/ref_counted.h" - class FilePath; namespace base { @@ -55,41 +53,6 @@ PlatformFile CreatePlatformFile(const std::wstring& name, // Closes a file handle bool ClosePlatformFile(PlatformFile file); -// Get the length of an underlying file. Returns false on error. Otherwise -// *size is set to the length of the file, in bytes. -bool GetPlatformFileSize(PlatformFile file, uint64* size); - -// This is a reference counted PlatformFile. When the ref count drops to zero, -// the file handle is closed. See the comments in base/ref_counted.h for -// details on how to use it. -class RefCountedPlatformFile : - public base::RefCountedThreadSafe<RefCountedPlatformFile> { - public: - RefCountedPlatformFile(PlatformFile f) : file_(f) { } - - ~RefCountedPlatformFile() { - if (file_ != kInvalidPlatformFileValue) { - ClosePlatformFile(file_); - file_ = kInvalidPlatformFileValue; - } - } - - PlatformFile get() const { - return file_; - } - - PlatformFile release() { - PlatformFile f = file_; - file_ = kInvalidPlatformFileValue; - return f; - } - - private: - PlatformFile file_; - - DISALLOW_COPY_AND_ASSIGN(RefCountedPlatformFile); -}; - } // namespace base #endif // BASE_PLATFORM_FILE_H_ diff --git a/base/platform_file_posix.cc b/base/platform_file_posix.cc index bfd40e9..46039b9 100644 --- a/base/platform_file_posix.cc +++ b/base/platform_file_posix.cc @@ -77,12 +77,4 @@ bool ClosePlatformFile(PlatformFile file) { return close(file); } -bool GetPlatformFileSize(PlatformFile file, uint64* out_size) { - struct stat st; - if (fstat(file, &st)) - return false; - *out_size = st.st_size; - return true; -} - } // namespace base diff --git a/base/platform_file_win.cc b/base/platform_file_win.cc index ccaee1e..1143487 100644 --- a/base/platform_file_win.cc +++ b/base/platform_file_win.cc @@ -75,12 +75,4 @@ bool ClosePlatformFile(PlatformFile file) { return (CloseHandle(file) == 0); } -bool GetPlatformFileSize(PlatformFile file, uint64* out_size) { - LARGE_INTEGER size; - if (!GetFileSizeEx(file, &size)) - return false; - *out_size = size.QuadPart; - return true; -} - } // namespace disk_cache |