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

Unified Diff: base/file_util_posix.cc

Issue 357003: Move the spellchecker to the renderer.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: rename Created 11 years, 1 month 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
Index: base/file_util_posix.cc
===================================================================
--- base/file_util_posix.cc (revision 31117)
+++ base/file_util_posix.cc (working copy)
@@ -667,30 +667,47 @@
// MemoryMappedFile
MemoryMappedFile::MemoryMappedFile()
- : file_(-1),
- data_(NULL),
+ : data_(NULL),
length_(0) {
}
+bool MemoryMappedFile::Initialize(const base::FileDescriptor& fd) {
+ if (IsValid())
+ return false;
+
+ file_ = fd;
+
+ if (!MapFileToMemoryInternal()) {
+ CloseHandles();
+ return false;
+ }
+
+ return true;
+}
+
bool MemoryMappedFile::MapFileToMemory(const FilePath& file_name) {
- file_ = open(file_name.value().c_str(), O_RDONLY);
+ file_ = base::FileDescriptor(open(file_name.value().c_str(), O_RDONLY), true);
- if (file_ == -1) {
+ if (file_.fd == -1) {
LOG(ERROR) << "Couldn't open " << file_name.value();
return false;
}
+ return MapFileToMemoryInternal();
+}
+
+bool MemoryMappedFile::MapFileToMemoryInternal() {
struct stat file_stat;
- if (fstat(file_, &file_stat) == -1) {
- LOG(ERROR) << "Couldn't fstat " << file_name.value() << ", errno " << errno;
+ if (fstat(file_.fd, &file_stat) == -1) {
+ LOG(ERROR) << "Couldn't fstat " << file_.fd << ", errno " << errno;
return false;
}
length_ = file_stat.st_size;
data_ = static_cast<uint8*>(
- mmap(NULL, length_, PROT_READ, MAP_SHARED, file_, 0));
+ mmap(NULL, length_, PROT_READ, MAP_SHARED, file_.fd, 0));
if (data_ == MAP_FAILED)
- LOG(ERROR) << "Couldn't mmap " << file_name.value() << ", errno " << errno;
+ LOG(ERROR) << "Couldn't mmap " << file_.fd << ", errno " << errno;
return data_ != MAP_FAILED;
}
@@ -698,12 +715,12 @@
void MemoryMappedFile::CloseHandles() {
if (data_ != NULL)
munmap(data_, length_);
- if (file_ != -1)
- close(file_);
+ if (file_.auto_close && file_.fd != -1)
+ close(file_.fd);
data_ = NULL;
length_ = 0;
- file_ = -1;
+ file_ = base::FileDescriptor();
}
} // namespace file_util
« no previous file with comments | « base/file_util.h ('k') | build/common.gypi » ('j') | chrome/browser/spellcheck_host.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698