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

Unified Diff: content/browser/file_descriptor_info_impl.cc

Issue 2613803003: Simplifying ContentBrowserClient::GetAdditionalMappedFiles...() (Closed)
Patch Set: Created 3 years, 11 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
Index: content/browser/file_descriptor_info_impl.cc
diff --git a/content/browser/file_descriptor_info_impl.cc b/content/browser/file_descriptor_info_impl.cc
index bfab143897d2dab682bc92e998a2a4beea8ed7de..33928197d25f361a6b6a691ca7a531629f48c1bb 100644
--- a/content/browser/file_descriptor_info_impl.cc
+++ b/content/browser/file_descriptor_info_impl.cc
@@ -22,11 +22,16 @@ FileDescriptorInfoImpl::~FileDescriptorInfoImpl() {
}
void FileDescriptorInfoImpl::Share(int id, base::PlatformFile fd) {
- AddToMapping(id, fd);
+ ShareWithRegion(id, fd, base::MemoryMappedFile::Region::kWholeFile);
+}
+
+void FileDescriptorInfoImpl::ShareWithRegion(int id, base::PlatformFile fd,
+ const base::MemoryMappedFile::Region& region) {
+ AddToMapping(id, fd, region);
}
void FileDescriptorInfoImpl::Transfer(int id, base::ScopedFD fd) {
- AddToMapping(id, fd.get());
+ AddToMapping(id, fd.get(), base::MemoryMappedFile::Region::kWholeFile);
owned_descriptors_.push_back(std::move(fd));
}
@@ -38,6 +43,13 @@ int FileDescriptorInfoImpl::GetIDAt(size_t i) const {
return mapping_[i].second;
}
+const base::MemoryMappedFile::Region& FileDescriptorInfoImpl::GetRegionAt(
+ size_t i) const {
+ auto iter = ids_to_regions_.find(GetIDAt(i));
+ return (iter != ids_to_regions_.end()) ?
+ iter->second : base::MemoryMappedFile::Region::kWholeFile;
+}
+
size_t FileDescriptorInfoImpl::GetMappingSize() const {
return mapping_.size();
}
@@ -68,9 +80,12 @@ base::ScopedFD FileDescriptorInfoImpl::ReleaseFD(base::PlatformFile file) {
return fd;
}
-void FileDescriptorInfoImpl::AddToMapping(int id, base::PlatformFile fd) {
+void FileDescriptorInfoImpl::AddToMapping(int id, base::PlatformFile fd,
+ const base::MemoryMappedFile::Region& region) {
DCHECK(!HasID(id));
mapping_.push_back(std::make_pair(fd, id));
+ if (region != base::MemoryMappedFile::Region::kWholeFile)
+ ids_to_regions_[id] = region;
}
const base::FileHandleMappingVector& FileDescriptorInfoImpl::GetMapping()

Powered by Google App Engine
This is Rietveld 408576698