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

Side by Side Diff: base/memory/shared_memory_mac.cc

Issue 2876593002: Change SharedMemory to initialize member vars in header. (Closed)
Patch Set: wstring -> string16 Created 3 years, 7 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 unified diff | Download patch
« no previous file with comments | « base/memory/shared_memory.h ('k') | base/memory/shared_memory_posix.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/memory/shared_memory.h" 5 #include "base/memory/shared_memory.h"
6 6
7 #include <errno.h> 7 #include <errno.h>
8 #include <mach/mach_vm.h> 8 #include <mach/mach_vm.h>
9 #include <stddef.h> 9 #include <stddef.h>
10 #include <sys/mman.h> 10 #include <sys/mman.h>
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 mach_task_self(), reinterpret_cast<memory_object_size_t*>(&size), 72 mach_task_self(), reinterpret_cast<memory_object_size_t*>(&size),
73 reinterpret_cast<memory_object_offset_t>(temp_addr), VM_PROT_READ, 73 reinterpret_cast<memory_object_offset_t>(temp_addr), VM_PROT_READ,
74 &named_right, MACH_PORT_NULL); 74 &named_right, MACH_PORT_NULL);
75 if (kr != KERN_SUCCESS) 75 if (kr != KERN_SUCCESS)
76 return false; 76 return false;
77 77
78 *new_handle = SharedMemoryHandle(named_right, size, handle.GetGUID()); 78 *new_handle = SharedMemoryHandle(named_right, size, handle.GetGUID());
79 return true; 79 return true;
80 } 80 }
81 81
82
83 } // namespace 82 } // namespace
84 83
85 SharedMemory::SharedMemory() 84 SharedMemory::SharedMemory() {}
86 : mapped_memory_mechanism_(SharedMemoryHandle::MACH),
87 mapped_size_(0),
88 memory_(NULL),
89 read_only_(false),
90 requested_size_(0) {}
91 85
92 SharedMemory::SharedMemory(const SharedMemoryHandle& handle, bool read_only) 86 SharedMemory::SharedMemory(const SharedMemoryHandle& handle, bool read_only)
93 : mapped_memory_mechanism_(SharedMemoryHandle::POSIX), 87 : mapped_memory_mechanism_(SharedMemoryHandle::POSIX),
94 shm_(handle), 88 shm_(handle),
95 mapped_size_(0), 89 read_only_(read_only) {}
96 memory_(NULL),
97 read_only_(read_only),
98 requested_size_(0) {}
99 90
100 SharedMemory::~SharedMemory() { 91 SharedMemory::~SharedMemory() {
101 Unmap(); 92 Unmap();
102 Close(); 93 Close();
103 } 94 }
104 95
105 // static 96 // static
106 bool SharedMemory::IsHandleValid(const SharedMemoryHandle& handle) { 97 bool SharedMemory::IsHandleValid(const SharedMemoryHandle& handle) {
107 return handle.IsValid(); 98 return handle.IsValid();
108 } 99 }
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after
273 264
274 DCHECK(shm_.IsValid()); 265 DCHECK(shm_.IsValid());
275 base::SharedMemoryHandle new_handle; 266 base::SharedMemoryHandle new_handle;
276 bool success = MakeMachSharedMemoryHandleReadOnly(&new_handle, shm_, memory_); 267 bool success = MakeMachSharedMemoryHandleReadOnly(&new_handle, shm_, memory_);
277 if (success) 268 if (success)
278 new_handle.SetOwnershipPassesToIPC(true); 269 new_handle.SetOwnershipPassesToIPC(true);
279 return new_handle; 270 return new_handle;
280 } 271 }
281 272
282 } // namespace base 273 } // namespace base
OLDNEW
« no previous file with comments | « base/memory/shared_memory.h ('k') | base/memory/shared_memory_posix.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698