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/browser/gpu/browser_gpu_channel_host_factory.h" | 5 #include "content/browser/gpu/browser_gpu_channel_host_factory.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/location.h" | 9 #include "base/location.h" |
10 #include "base/profiler/scoped_tracker.h" | 10 #include "base/profiler/scoped_tracker.h" |
(...skipping 10 matching lines...) Expand all Loading... |
21 #include "content/browser/gpu/shader_cache_factory.h" | 21 #include "content/browser/gpu/shader_cache_factory.h" |
22 #include "content/common/child_process_host_impl.h" | 22 #include "content/common/child_process_host_impl.h" |
23 #include "content/public/browser/browser_thread.h" | 23 #include "content/public/browser/browser_thread.h" |
24 #include "content/public/browser/content_browser_client.h" | 24 #include "content/public/browser/content_browser_client.h" |
25 #include "content/public/browser/gpu_data_manager.h" | 25 #include "content/public/browser/gpu_data_manager.h" |
26 #include "content/public/common/content_client.h" | 26 #include "content/public/common/content_client.h" |
27 #include "gpu/command_buffer/service/gpu_switches.h" | 27 #include "gpu/command_buffer/service/gpu_switches.h" |
28 #include "gpu/ipc/common/gpu_messages.h" | 28 #include "gpu/ipc/common/gpu_messages.h" |
29 #include "ipc/ipc_channel_handle.h" | 29 #include "ipc/ipc_channel_handle.h" |
30 #include "ipc/message_filter.h" | 30 #include "ipc/message_filter.h" |
| 31 #include "services/resource_coordinator/public/interfaces/memory/constants.mojom
.h" |
31 #include "services/service_manager/runner/common/client_util.h" | 32 #include "services/service_manager/runner/common/client_util.h" |
32 | 33 |
33 namespace content { | 34 namespace content { |
34 | 35 |
35 BrowserGpuChannelHostFactory* BrowserGpuChannelHostFactory::instance_ = NULL; | 36 BrowserGpuChannelHostFactory* BrowserGpuChannelHostFactory::instance_ = NULL; |
36 | 37 |
37 class BrowserGpuChannelHostFactory::EstablishRequest | 38 class BrowserGpuChannelHostFactory::EstablishRequest |
38 : public base::RefCountedThreadSafe<EstablishRequest> { | 39 : public base::RefCountedThreadSafe<EstablishRequest> { |
39 public: | 40 public: |
40 static scoped_refptr<EstablishRequest> Create(int gpu_client_id, | 41 static scoped_refptr<EstablishRequest> Create(int gpu_client_id, |
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
219 } | 220 } |
220 | 221 |
221 void BrowserGpuChannelHostFactory::Terminate() { | 222 void BrowserGpuChannelHostFactory::Terminate() { |
222 DCHECK(instance_); | 223 DCHECK(instance_); |
223 delete instance_; | 224 delete instance_; |
224 instance_ = NULL; | 225 instance_ = NULL; |
225 } | 226 } |
226 | 227 |
227 BrowserGpuChannelHostFactory::BrowserGpuChannelHostFactory() | 228 BrowserGpuChannelHostFactory::BrowserGpuChannelHostFactory() |
228 : gpu_client_id_(ChildProcessHostImpl::GenerateChildProcessUniqueId()), | 229 : gpu_client_id_(ChildProcessHostImpl::GenerateChildProcessUniqueId()), |
229 gpu_client_tracing_id_(ChildProcessHost::kBrowserTracingProcessId), | 230 gpu_client_tracing_id_( |
| 231 memory_instrumentation::mojom::kServiceTracingProcessId), |
230 shutdown_event_(new base::WaitableEvent( | 232 shutdown_event_(new base::WaitableEvent( |
231 base::WaitableEvent::ResetPolicy::MANUAL, | 233 base::WaitableEvent::ResetPolicy::MANUAL, |
232 base::WaitableEvent::InitialState::NOT_SIGNALED)), | 234 base::WaitableEvent::InitialState::NOT_SIGNALED)), |
233 gpu_memory_buffer_manager_( | 235 gpu_memory_buffer_manager_( |
234 new BrowserGpuMemoryBufferManager(gpu_client_id_, | 236 new BrowserGpuMemoryBufferManager(gpu_client_id_, |
235 gpu_client_tracing_id_)), | 237 gpu_client_tracing_id_)), |
236 gpu_host_id_(0) { | 238 gpu_host_id_(0) { |
237 if (!base::CommandLine::ForCurrentProcess()->HasSwitch( | 239 if (!base::CommandLine::ForCurrentProcess()->HasSwitch( |
238 switches::kDisableGpuShaderDiskCache)) { | 240 switches::kDisableGpuShaderDiskCache)) { |
239 DCHECK(GetContentClient()); | 241 DCHECK(GetContentClient()); |
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
374 } | 376 } |
375 | 377 |
376 // static | 378 // static |
377 void BrowserGpuChannelHostFactory::InitializeShaderDiskCacheOnIO( | 379 void BrowserGpuChannelHostFactory::InitializeShaderDiskCacheOnIO( |
378 int gpu_client_id, | 380 int gpu_client_id, |
379 const base::FilePath& cache_dir) { | 381 const base::FilePath& cache_dir) { |
380 GetShaderCacheFactorySingleton()->SetCacheInfo(gpu_client_id, cache_dir); | 382 GetShaderCacheFactorySingleton()->SetCacheInfo(gpu_client_id, cache_dir); |
381 } | 383 } |
382 | 384 |
383 } // namespace content | 385 } // namespace content |
OLD | NEW |