| 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 "gpu/ipc/service/gpu_channel_manager.h" | 5 #include "gpu/ipc/service/gpu_channel_manager.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 27 matching lines...) Expand all Loading... |
| 38 // Maximum amount of time we keep pinging the GPU waiting for the client to | 38 // Maximum amount of time we keep pinging the GPU waiting for the client to |
| 39 // draw. | 39 // draw. |
| 40 const int kMaxKeepAliveTimeMs = 200; | 40 const int kMaxKeepAliveTimeMs = 200; |
| 41 #endif | 41 #endif |
| 42 | 42 |
| 43 } | 43 } |
| 44 | 44 |
| 45 GpuChannelManager::GpuChannelManager( | 45 GpuChannelManager::GpuChannelManager( |
| 46 const GpuPreferences& gpu_preferences, | 46 const GpuPreferences& gpu_preferences, |
| 47 GpuChannelManagerDelegate* delegate, | 47 GpuChannelManagerDelegate* delegate, |
| 48 GpuWatchdog* watchdog, | 48 GpuWatchdogThread* watchdog, |
| 49 base::SingleThreadTaskRunner* task_runner, | 49 base::SingleThreadTaskRunner* task_runner, |
| 50 base::SingleThreadTaskRunner* io_task_runner, | 50 base::SingleThreadTaskRunner* io_task_runner, |
| 51 base::WaitableEvent* shutdown_event, | 51 base::WaitableEvent* shutdown_event, |
| 52 SyncPointManager* sync_point_manager, | 52 SyncPointManager* sync_point_manager, |
| 53 GpuMemoryBufferFactory* gpu_memory_buffer_factory) | 53 GpuMemoryBufferFactory* gpu_memory_buffer_factory) |
| 54 : task_runner_(task_runner), | 54 : task_runner_(task_runner), |
| 55 io_task_runner_(io_task_runner), | 55 io_task_runner_(io_task_runner), |
| 56 gpu_preferences_(gpu_preferences), | 56 gpu_preferences_(gpu_preferences), |
| 57 gpu_driver_bug_workarounds_(base::CommandLine::ForCurrentProcess()), | 57 gpu_driver_bug_workarounds_(base::CommandLine::ForCurrentProcess()), |
| 58 delegate_(delegate), | 58 delegate_(delegate), |
| (...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 283 } | 283 } |
| 284 } | 284 } |
| 285 if (!stub || !stub->decoder()->MakeCurrent()) | 285 if (!stub || !stub->decoder()->MakeCurrent()) |
| 286 return; | 286 return; |
| 287 glFinish(); | 287 glFinish(); |
| 288 DidAccessGpu(); | 288 DidAccessGpu(); |
| 289 } | 289 } |
| 290 #endif | 290 #endif |
| 291 | 291 |
| 292 } // namespace gpu | 292 } // namespace gpu |
| OLD | NEW |