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

Unified Diff: base/memory/shared_memory_win.cc

Issue 1122163002: Ensure that the DirectWrite font cache works in Chrome canary on Windows 8+ with AppContainer prote… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 side-by-side diff with in-line comments
Download patch
Index: base/memory/shared_memory_win.cc
diff --git a/base/memory/shared_memory_win.cc b/base/memory/shared_memory_win.cc
index 7e0cf0bf23e67f0d13d22e56e0924cecda7456ce..9feaf3cc33ae18a0e11adc6b660747eea4be0146 100644
--- a/base/memory/shared_memory_win.cc
+++ b/base/memory/shared_memory_win.cc
@@ -29,6 +29,7 @@ namespace base {
SharedMemory::SharedMemory()
: mapped_file_(NULL),
+ inheritable_(false),
memory_(NULL),
read_only_(false),
mapped_size_(0),
@@ -38,6 +39,7 @@ SharedMemory::SharedMemory()
SharedMemory::SharedMemory(const std::wstring& name)
: mapped_file_(NULL),
+ inheritable_(false),
memory_(NULL),
read_only_(false),
requested_size_(0),
@@ -48,6 +50,7 @@ SharedMemory::SharedMemory(const std::wstring& name)
SharedMemory::SharedMemory(SharedMemoryHandle handle, bool read_only)
: mapped_file_(handle),
+ inheritable_(false),
memory_(NULL),
read_only_(read_only),
requested_size_(0),
@@ -58,6 +61,7 @@ SharedMemory::SharedMemory(SharedMemoryHandle handle, bool read_only)
SharedMemory::SharedMemory(SharedMemoryHandle handle, bool read_only,
ProcessHandle process)
: mapped_file_(NULL),
+ inheritable_(false),
memory_(NULL),
read_only_(read_only),
requested_size_(0),
@@ -177,7 +181,7 @@ bool SharedMemory::Open(const std::string& name, bool read_only) {
read_only_ = read_only;
mapped_file_ = OpenFileMapping(
read_only_ ? FILE_MAP_READ : FILE_MAP_READ | FILE_MAP_WRITE,
- false, name_.empty() ? NULL : name_.c_str());
+ inheritable_, name_.empty() ? NULL : name_.c_str());
if (mapped_file_ != NULL) {
// Note: size_ is not set in this case.
return true;

Powered by Google App Engine
This is Rietveld 408576698