Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 "content/common/child_process_host_impl.h" | 5 #include "content/common/child_process_host_impl.h" |
| 6 | 6 |
| 7 #include <limits> | 7 #include <limits> |
| 8 | 8 |
| 9 #include "base/atomic_sequence_num.h" | 9 #include "base/atomic_sequence_num.h" |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 13 matching lines...) Expand all Loading... | |
| 24 #include "content/public/common/content_paths.h" | 24 #include "content/public/common/content_paths.h" |
| 25 #include "content/public/common/content_switches.h" | 25 #include "content/public/common/content_switches.h" |
| 26 #include "ipc/ipc_channel.h" | 26 #include "ipc/ipc_channel.h" |
| 27 #include "ipc/ipc_logging.h" | 27 #include "ipc/ipc_logging.h" |
| 28 #include "ipc/message_filter.h" | 28 #include "ipc/message_filter.h" |
| 29 | 29 |
| 30 #if defined(OS_LINUX) | 30 #if defined(OS_LINUX) |
| 31 #include "base/linux_util.h" | 31 #include "base/linux_util.h" |
| 32 #elif defined(OS_WIN) | 32 #elif defined(OS_WIN) |
| 33 #include "content/common/font_cache_dispatcher_win.h" | 33 #include "content/common/font_cache_dispatcher_win.h" |
| 34 #include "ipc/attachment_broker_win.h" | 34 #include "ipc/attachment_broker_privileged_win.h" |
| 35 #endif // OS_LINUX | 35 #endif // OS_LINUX |
| 36 | 36 |
| 37 #if defined(OS_WIN) | 37 #if defined(OS_WIN) |
| 38 base::LazyInstance<IPC::AttachmentBrokerWin>::Leaky g_attachment_broker = | 38 base::LazyInstance<IPC::AttachmentBrokerPrivilegedWin>::Leaky |
|
erikchen
2015/07/28 20:55:56
I snuck in this change, replacing AttachmentBroker
| |
| 39 LAZY_INSTANCE_INITIALIZER; | 39 g_attachment_broker = LAZY_INSTANCE_INITIALIZER; |
| 40 #endif // defined(OS_WIN) | 40 #endif // defined(OS_WIN) |
| 41 | 41 |
| 42 namespace { | 42 namespace { |
| 43 | 43 |
| 44 #if defined(OS_MACOSX) | 44 #if defined(OS_MACOSX) |
| 45 // Given |path| identifying a Mac-style child process executable path, adjusts | 45 // Given |path| identifying a Mac-style child process executable path, adjusts |
| 46 // it to correspond to |feature|. For a child process path such as | 46 // it to correspond to |feature|. For a child process path such as |
| 47 // ".../Chromium Helper.app/Contents/MacOS/Chromium Helper", the transformed | 47 // ".../Chromium Helper.app/Contents/MacOS/Chromium Helper", the transformed |
| 48 // path for feature "NP" would be | 48 // path for feature "NP" would be |
| 49 // ".../Chromium Helper NP.app/Contents/MacOS/Chromium Helper NP". The new | 49 // ".../Chromium Helper NP.app/Contents/MacOS/Chromium Helper NP". The new |
| (...skipping 298 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 348 } | 348 } |
| 349 | 349 |
| 350 void ChildProcessHostImpl::OnDeletedGpuMemoryBuffer( | 350 void ChildProcessHostImpl::OnDeletedGpuMemoryBuffer( |
| 351 gfx::GpuMemoryBufferId id, | 351 gfx::GpuMemoryBufferId id, |
| 352 uint32 sync_point) { | 352 uint32 sync_point) { |
| 353 // Note: Nothing to do here as ownership of shared memory backed | 353 // Note: Nothing to do here as ownership of shared memory backed |
| 354 // GpuMemoryBuffers is passed with IPC. | 354 // GpuMemoryBuffers is passed with IPC. |
| 355 } | 355 } |
| 356 | 356 |
| 357 } // namespace content | 357 } // namespace content |
| OLD | NEW |