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

Unified Diff: base/memory/shared_memory.h

Issue 2854833004: Use SharedMemoryHandle instead ScopedHandle as ivar for SharedMemory (Closed)
Patch Set: close should be idempotent. Created 3 years, 8 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 | « no previous file | base/memory/shared_memory_handle.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/memory/shared_memory.h
diff --git a/base/memory/shared_memory.h b/base/memory/shared_memory.h
index 154d808cc8cd71bbd13ba531e9a6643ecd5b6f89..89bc24ac0230e7facf3f021595a6613fa2a22001 100644
--- a/base/memory/shared_memory.h
+++ b/base/memory/shared_memory.h
@@ -241,10 +241,7 @@ class BASE_EXPORT SharedMemory {
// before being mapped.
bool external_section_;
std::wstring name_;
- win::ScopedHandle mapped_file_;
#else
- // The OS primitive that backs the shared memory region.
- SharedMemoryHandle shm_;
// If valid, points to the same memory region as shm_, but with readonly
// permissions.
@@ -257,6 +254,9 @@ class BASE_EXPORT SharedMemory {
SharedMemoryHandle::Type mapped_memory_mechanism_;
#endif
+ // The OS primitive that backs the shared memory region.
+ SharedMemoryHandle shm_;
+
size_t mapped_size_;
void* memory_;
bool read_only_;
« no previous file with comments | « no previous file | base/memory/shared_memory_handle.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698