diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-14 19:36:50 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-14 19:36:50 +0000 |
| commit | c0e895e2961bd05570b0d7660016914601bf8c7d (patch) | |
| tree | 3104b59d5f4d22ad60a35a3bcefdb7caff27d3c0 /base/memory/shared_memory.h | |
| parent | 5fcc99e7cf20aa9d0c44e2fdaef207d9e45f907a (diff) | |
| download | chromium_src-c0e895e2961bd05570b0d7660016914601bf8c7d.zip chromium_src-c0e895e2961bd05570b0d7660016914601bf8c7d.tar.gz chromium_src-c0e895e2961bd05570b0d7660016914601bf8c7d.tar.bz2 | |
Implement ScopedFD in terms of ScopedGeneric.
Move to a new file base/files/scoped_file.h. I will also add ScopedFILE to here (currently in file_util.h) later.
I think there is a crash in the old code in content/browser/zygote_host/zygote_host_impl_linux.cc that this patch should fix. The old ScopedFD took the address of something in a vector that is being modified.
I removed SafeScopedFD from content/common/sandbox_linux/sandbox_linux.cc since base's ScopedFD not CHECKs on close failure (this is a more recent addition).
BUG=
R=agl@chromium.org, viettrungluu@chromium.org
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=257001
Review URL: https://codereview.chromium.org/191673003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@257179 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/memory/shared_memory.h')
| -rw-r--r-- | base/memory/shared_memory.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/base/memory/shared_memory.h b/base/memory/shared_memory.h index 50b61c4..8e32e72 100644 --- a/base/memory/shared_memory.h +++ b/base/memory/shared_memory.h @@ -22,6 +22,7 @@ #if defined(OS_POSIX) #include "base/file_descriptor_posix.h" #include "base/file_util.h" +#include "base/files/scoped_file.h" #endif namespace base { @@ -259,7 +260,7 @@ class BASE_EXPORT SharedMemory { private: #if defined(OS_POSIX) && !defined(OS_NACL) - bool PrepareMapFile(file_util::ScopedFILE fp, file_util::ScopedFD readonly); + bool PrepareMapFile(file_util::ScopedFILE fp, base::ScopedFD readonly); bool FilePathForMemoryName(const std::string& mem_name, FilePath* path); void LockOrUnlockCommon(int function); #endif |