| 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_;
|
|
|