| 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/ppapi_plugin/ppapi_thread.h" | 5 #include "content/ppapi_plugin/ppapi_thread.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <limits> | 9 #include <limits> |
| 10 | 10 |
| (...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 189 return ChildProcess::current()->GetShutDownEvent(); | 189 return ChildProcess::current()->GetShutDownEvent(); |
| 190 } | 190 } |
| 191 | 191 |
| 192 IPC::PlatformFileForTransit PpapiThread::ShareHandleWithRemote( | 192 IPC::PlatformFileForTransit PpapiThread::ShareHandleWithRemote( |
| 193 base::PlatformFile handle, | 193 base::PlatformFile handle, |
| 194 base::ProcessId peer_pid, | 194 base::ProcessId peer_pid, |
| 195 bool should_close_source) { | 195 bool should_close_source) { |
| 196 #if defined(OS_WIN) | 196 #if defined(OS_WIN) |
| 197 if (peer_handle_.IsValid()) { | 197 if (peer_handle_.IsValid()) { |
| 198 DCHECK(is_broker_); | 198 DCHECK(is_broker_); |
| 199 return IPC::GetFileHandleForProcess(handle, peer_handle_.Get(), | 199 return IPC::GetPlatformFileForTransit(handle, should_close_source); |
| 200 should_close_source); | |
| 201 } | 200 } |
| 202 #endif | 201 #endif |
| 203 | 202 |
| 204 DCHECK(peer_pid != base::kNullProcessId); | 203 DCHECK(peer_pid != base::kNullProcessId); |
| 205 return BrokerGetFileHandleForProcess(handle, peer_pid, should_close_source); | 204 return BrokerGetFileHandleForProcess(handle, peer_pid, should_close_source); |
| 206 } | 205 } |
| 207 | 206 |
| 208 base::SharedMemoryHandle PpapiThread::ShareSharedMemoryHandleWithRemote( | 207 base::SharedMemoryHandle PpapiThread::ShareSharedMemoryHandleWithRemote( |
| 209 const base::SharedMemoryHandle& handle, | 208 const base::SharedMemoryHandle& handle, |
| 210 base::ProcessId remote_pid) { | 209 base::ProcessId remote_pid) { |
| (...skipping 392 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 603 GetHistogramName(is_broker_, "LoadTime", path), | 602 GetHistogramName(is_broker_, "LoadTime", path), |
| 604 base::TimeDelta::FromMilliseconds(1), | 603 base::TimeDelta::FromMilliseconds(1), |
| 605 base::TimeDelta::FromSeconds(10), | 604 base::TimeDelta::FromSeconds(10), |
| 606 50, | 605 50, |
| 607 base::HistogramBase::kUmaTargetedHistogramFlag); | 606 base::HistogramBase::kUmaTargetedHistogramFlag); |
| 608 | 607 |
| 609 histogram->AddTime(load_time); | 608 histogram->AddTime(load_time); |
| 610 } | 609 } |
| 611 | 610 |
| 612 } // namespace content | 611 } // namespace content |
| OLD | NEW |