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/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" |
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
179 g_thread_safe_sender.Get() = thread_safe_sender(); | 179 g_thread_safe_sender.Get() = thread_safe_sender(); |
180 g_lazy_tls.Pointer()->Set(this); | 180 g_lazy_tls.Pointer()->Set(this); |
181 } | 181 } |
182 | 182 |
183 GpuChildThread::GpuChildThread( | 183 GpuChildThread::GpuChildThread( |
184 const gpu::GpuPreferences& gpu_preferences, | 184 const gpu::GpuPreferences& gpu_preferences, |
185 const InProcessChildThreadParams& params, | 185 const InProcessChildThreadParams& params, |
186 gpu::GpuMemoryBufferFactory* gpu_memory_buffer_factory) | 186 gpu::GpuMemoryBufferFactory* gpu_memory_buffer_factory) |
187 : ChildThreadImpl(ChildThreadImpl::Options::Builder() | 187 : ChildThreadImpl(ChildThreadImpl::Options::Builder() |
188 .InBrowserProcess(params) | 188 .InBrowserProcess(params) |
| 189 .UseMojoChannel(true) |
189 .AddStartupFilter(new GpuMemoryBufferMessageFilter( | 190 .AddStartupFilter(new GpuMemoryBufferMessageFilter( |
190 gpu_memory_buffer_factory)) | 191 gpu_memory_buffer_factory)) |
191 .Build()), | 192 .Build()), |
192 gpu_preferences_(gpu_preferences), | 193 gpu_preferences_(gpu_preferences), |
193 dead_on_arrival_(false), | 194 dead_on_arrival_(false), |
194 in_browser_process_(true), | 195 in_browser_process_(true), |
195 gpu_memory_buffer_factory_(gpu_memory_buffer_factory) { | 196 gpu_memory_buffer_factory_(gpu_memory_buffer_factory) { |
196 #if defined(OS_WIN) | 197 #if defined(OS_WIN) |
197 target_services_ = NULL; | 198 target_services_ = NULL; |
198 #endif | 199 #endif |
(...skipping 371 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
570 | 571 |
571 void GpuChildThread::BindProcessControlRequest( | 572 void GpuChildThread::BindProcessControlRequest( |
572 mojo::InterfaceRequest<mojom::ProcessControl> request) { | 573 mojo::InterfaceRequest<mojom::ProcessControl> request) { |
573 DVLOG(1) << "GPU: Binding ProcessControl request"; | 574 DVLOG(1) << "GPU: Binding ProcessControl request"; |
574 DCHECK(process_control_); | 575 DCHECK(process_control_); |
575 process_control_bindings_.AddBinding(process_control_.get(), | 576 process_control_bindings_.AddBinding(process_control_.get(), |
576 std::move(request)); | 577 std::move(request)); |
577 } | 578 } |
578 | 579 |
579 } // namespace content | 580 } // namespace content |
OLD | NEW |