| OLD | NEW |
| 1 // Copyright (c) 2015 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2015 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_test_common.h" | 5 #include "gpu/ipc/service/gpu_channel_test_common.h" |
| 6 | 6 |
| 7 #include "base/memory/ptr_util.h" | 7 #include "base/memory/ptr_util.h" |
| 8 #include "base/test/test_simple_task_runner.h" | 8 #include "base/test/test_simple_task_runner.h" |
| 9 #include "base/threading/thread_task_runner_handle.h" | 9 #include "base/threading/thread_task_runner_handle.h" |
| 10 #include "gpu/command_buffer/common/activity_flags.h" |
| 10 #include "gpu/command_buffer/service/sync_point_manager.h" | 11 #include "gpu/command_buffer/service/sync_point_manager.h" |
| 11 #include "gpu/ipc/service/gpu_channel_manager_delegate.h" | 12 #include "gpu/ipc/service/gpu_channel_manager_delegate.h" |
| 12 #include "ipc/ipc_test_sink.h" | 13 #include "ipc/ipc_test_sink.h" |
| 13 #include "url/gurl.h" | 14 #include "url/gurl.h" |
| 14 | 15 |
| 15 namespace gpu { | 16 namespace gpu { |
| 16 | 17 |
| 17 TestGpuChannelManagerDelegate::TestGpuChannelManagerDelegate() {} | 18 TestGpuChannelManagerDelegate::TestGpuChannelManagerDelegate() {} |
| 18 | 19 |
| 19 TestGpuChannelManagerDelegate::~TestGpuChannelManagerDelegate() {} | 20 TestGpuChannelManagerDelegate::~TestGpuChannelManagerDelegate() {} |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 52 SyncPointManager* sync_point_manager, | 53 SyncPointManager* sync_point_manager, |
| 53 GpuMemoryBufferFactory* gpu_memory_buffer_factory) | 54 GpuMemoryBufferFactory* gpu_memory_buffer_factory) |
| 54 : GpuChannelManager(gpu_preferences, | 55 : GpuChannelManager(gpu_preferences, |
| 55 delegate, | 56 delegate, |
| 56 nullptr, | 57 nullptr, |
| 57 task_runner, | 58 task_runner, |
| 58 io_task_runner, | 59 io_task_runner, |
| 59 nullptr, | 60 nullptr, |
| 60 sync_point_manager, | 61 sync_point_manager, |
| 61 gpu_memory_buffer_factory, | 62 gpu_memory_buffer_factory, |
| 62 GpuFeatureInfo()) {} | 63 GpuFeatureInfo(), |
| 64 GpuProcessActivityFlags()) {} |
| 63 | 65 |
| 64 TestGpuChannelManager::~TestGpuChannelManager() { | 66 TestGpuChannelManager::~TestGpuChannelManager() { |
| 65 // Clear gpu channels here so that any IPC messages sent are handled using the | 67 // Clear gpu channels here so that any IPC messages sent are handled using the |
| 66 // overridden Send method. | 68 // overridden Send method. |
| 67 gpu_channels_.clear(); | 69 gpu_channels_.clear(); |
| 68 } | 70 } |
| 69 | 71 |
| 70 std::unique_ptr<GpuChannel> TestGpuChannelManager::CreateGpuChannel( | 72 std::unique_ptr<GpuChannel> TestGpuChannelManager::CreateGpuChannel( |
| 71 int client_id, | 73 int client_id, |
| 72 uint64_t client_tracing_id, | 74 uint64_t client_tracing_id, |
| (...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 147 io_task_runner_.get(), sync_point_manager_.get(), nullptr)); | 149 io_task_runner_.get(), sync_point_manager_.get(), nullptr)); |
| 148 } | 150 } |
| 149 | 151 |
| 150 void GpuChannelTestCommon::TearDown() { | 152 void GpuChannelTestCommon::TearDown() { |
| 151 // Destroying channels causes tasks to run on the IO task runner. | 153 // Destroying channels causes tasks to run on the IO task runner. |
| 152 channel_manager_ = nullptr; | 154 channel_manager_ = nullptr; |
| 153 } | 155 } |
| 154 | 156 |
| 155 | 157 |
| 156 } // namespace gpu | 158 } // namespace gpu |
| OLD | NEW |