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

Side by Side Diff: content/gpu/gpu_child_thread.cc

Issue 2286063003: gpu: Move GpuWatchdogThread into //gpu/ipc/service from content. (Closed)
Patch Set: tot merge Created 4 years, 3 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 unified diff | Download patch
« no previous file with comments | « content/gpu/gpu_child_thread.h ('k') | content/gpu/gpu_main.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/gpu/gpu_child_thread.h" 5 #include "content/gpu/gpu_child_thread.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "base/callback_helpers.h" 11 #include "base/callback_helpers.h"
12 #include "base/lazy_instance.h" 12 #include "base/lazy_instance.h"
13 #include "base/strings/string_number_conversions.h" 13 #include "base/strings/string_number_conversions.h"
14 #include "base/threading/thread_local.h" 14 #include "base/threading/thread_local.h"
15 #include "base/threading/worker_pool.h" 15 #include "base/threading/worker_pool.h"
16 #include "build/build_config.h" 16 #include "build/build_config.h"
17 #include "content/child/child_process.h" 17 #include "content/child/child_process.h"
18 #include "content/child/thread_safe_sender.h" 18 #include "content/child/thread_safe_sender.h"
19 #include "content/common/establish_channel_params.h" 19 #include "content/common/establish_channel_params.h"
20 #include "content/common/gpu_host_messages.h" 20 #include "content/common/gpu_host_messages.h"
21 #include "content/common/mojo/constants.h" 21 #include "content/common/mojo/constants.h"
22 #include "content/gpu/gpu_service_factory.h" 22 #include "content/gpu/gpu_service_factory.h"
23 #include "content/gpu/gpu_watchdog_thread.h"
24 #include "content/public/common/content_client.h" 23 #include "content/public/common/content_client.h"
25 #include "content/public/common/content_switches.h" 24 #include "content/public/common/content_switches.h"
26 #include "content/public/common/mojo_shell_connection.h" 25 #include "content/public/common/mojo_shell_connection.h"
27 #include "content/public/gpu/content_gpu_client.h" 26 #include "content/public/gpu/content_gpu_client.h"
28 #include "gpu/command_buffer/service/gpu_switches.h" 27 #include "gpu/command_buffer/service/gpu_switches.h"
29 #include "gpu/command_buffer/service/sync_point_manager.h" 28 #include "gpu/command_buffer/service/sync_point_manager.h"
30 #include "gpu/config/gpu_info_collector.h" 29 #include "gpu/config/gpu_info_collector.h"
31 #include "gpu/config/gpu_switches.h" 30 #include "gpu/config/gpu_switches.h"
32 #include "gpu/config/gpu_util.h" 31 #include "gpu/config/gpu_util.h"
33 #include "gpu/ipc/common/memory_stats.h" 32 #include "gpu/ipc/common/memory_stats.h"
34 #include "gpu/ipc/service/gpu_memory_buffer_factory.h" 33 #include "gpu/ipc/service/gpu_memory_buffer_factory.h"
34 #include "gpu/ipc/service/gpu_watchdog_thread.h"
35 #include "ipc/ipc_channel_handle.h" 35 #include "ipc/ipc_channel_handle.h"
36 #include "ipc/ipc_sync_message_filter.h" 36 #include "ipc/ipc_sync_message_filter.h"
37 #include "media/gpu/ipc/service/gpu_jpeg_decode_accelerator.h" 37 #include "media/gpu/ipc/service/gpu_jpeg_decode_accelerator.h"
38 #include "media/gpu/ipc/service/gpu_video_decode_accelerator.h" 38 #include "media/gpu/ipc/service/gpu_video_decode_accelerator.h"
39 #include "media/gpu/ipc/service/gpu_video_encode_accelerator.h" 39 #include "media/gpu/ipc/service/gpu_video_encode_accelerator.h"
40 #include "media/gpu/ipc/service/media_service.h" 40 #include "media/gpu/ipc/service/media_service.h"
41 #include "services/shell/public/cpp/interface_registry.h" 41 #include "services/shell/public/cpp/interface_registry.h"
42 #include "ui/gl/gl_implementation.h" 42 #include "ui/gl/gl_implementation.h"
43 #include "ui/gl/gl_switches.h" 43 #include "ui/gl/gl_switches.h"
44 #include "ui/gl/gpu_switching_manager.h" 44 #include "ui/gl/gpu_switching_manager.h"
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 #endif 138 #endif
139 139
140 builder.ConnectToBrowser(true); 140 builder.ConnectToBrowser(true);
141 141
142 return builder.Build(); 142 return builder.Build();
143 } 143 }
144 144
145 } // namespace 145 } // namespace
146 146
147 GpuChildThread::GpuChildThread( 147 GpuChildThread::GpuChildThread(
148 GpuWatchdogThread* watchdog_thread, 148 gpu::GpuWatchdogThread* watchdog_thread,
149 bool dead_on_arrival, 149 bool dead_on_arrival,
150 const gpu::GPUInfo& gpu_info, 150 const gpu::GPUInfo& gpu_info,
151 const DeferredMessages& deferred_messages, 151 const DeferredMessages& deferred_messages,
152 gpu::GpuMemoryBufferFactory* gpu_memory_buffer_factory) 152 gpu::GpuMemoryBufferFactory* gpu_memory_buffer_factory)
153 : ChildThreadImpl(GetOptions(gpu_memory_buffer_factory)), 153 : ChildThreadImpl(GetOptions(gpu_memory_buffer_factory)),
154 dead_on_arrival_(dead_on_arrival), 154 dead_on_arrival_(dead_on_arrival),
155 gpu_info_(gpu_info), 155 gpu_info_(gpu_info),
156 deferred_messages_(deferred_messages), 156 deferred_messages_(deferred_messages),
157 in_browser_process_(false), 157 in_browser_process_(false),
158 gpu_memory_buffer_factory_(gpu_memory_buffer_factory) { 158 gpu_memory_buffer_factory_(gpu_memory_buffer_factory) {
(...skipping 403 matching lines...) Expand 10 before | Expand all | Expand 10 after
562 562
563 void GpuChildThread::BindServiceFactoryRequest( 563 void GpuChildThread::BindServiceFactoryRequest(
564 shell::mojom::ServiceFactoryRequest request) { 564 shell::mojom::ServiceFactoryRequest request) {
565 DVLOG(1) << "GPU: Binding shell::mojom::ServiceFactoryRequest"; 565 DVLOG(1) << "GPU: Binding shell::mojom::ServiceFactoryRequest";
566 DCHECK(service_factory_); 566 DCHECK(service_factory_);
567 service_factory_bindings_.AddBinding(service_factory_.get(), 567 service_factory_bindings_.AddBinding(service_factory_.get(),
568 std::move(request)); 568 std::move(request));
569 } 569 }
570 570
571 } // namespace content 571 } // namespace content
OLDNEW
« no previous file with comments | « content/gpu/gpu_child_thread.h ('k') | content/gpu/gpu_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698