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 20 matching lines...) Expand all Loading... |
31 #include "gpu/ipc/service/gpu_memory_buffer_factory.h" | 31 #include "gpu/ipc/service/gpu_memory_buffer_factory.h" |
32 #include "ipc/ipc_channel_handle.h" | 32 #include "ipc/ipc_channel_handle.h" |
33 #include "ipc/ipc_sync_message_filter.h" | 33 #include "ipc/ipc_sync_message_filter.h" |
34 #include "media/gpu/ipc/service/gpu_jpeg_decode_accelerator.h" | 34 #include "media/gpu/ipc/service/gpu_jpeg_decode_accelerator.h" |
35 #include "media/gpu/ipc/service/gpu_video_decode_accelerator.h" | 35 #include "media/gpu/ipc/service/gpu_video_decode_accelerator.h" |
36 #include "media/gpu/ipc/service/gpu_video_encode_accelerator.h" | 36 #include "media/gpu/ipc/service/gpu_video_encode_accelerator.h" |
37 #include "media/gpu/ipc/service/media_service.h" | 37 #include "media/gpu/ipc/service/media_service.h" |
38 #include "ui/gl/gl_implementation.h" | 38 #include "ui/gl/gl_implementation.h" |
39 #include "ui/gl/gl_switches.h" | 39 #include "ui/gl/gl_switches.h" |
40 #include "ui/gl/gpu_switching_manager.h" | 40 #include "ui/gl/gpu_switching_manager.h" |
| 41 #include "ui/gl/init/gl_factory.h" |
41 #include "url/gurl.h" | 42 #include "url/gurl.h" |
42 | 43 |
43 #if defined(USE_OZONE) | 44 #if defined(USE_OZONE) |
44 #include "ui/ozone/public/gpu_platform_support.h" | 45 #include "ui/ozone/public/gpu_platform_support.h" |
45 #include "ui/ozone/public/ozone_platform.h" | 46 #include "ui/ozone/public/ozone_platform.h" |
46 #endif | 47 #endif |
47 | 48 |
48 #if defined(OS_ANDROID) | 49 #if defined(OS_ANDROID) |
49 #include "media/gpu/avda_surface_tracker.h" | 50 #include "media/gpu/avda_surface_tracker.h" |
50 #endif | 51 #endif |
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
192 in_browser_process_(true), | 193 in_browser_process_(true), |
193 gpu_memory_buffer_factory_(gpu_memory_buffer_factory) { | 194 gpu_memory_buffer_factory_(gpu_memory_buffer_factory) { |
194 #if defined(OS_WIN) | 195 #if defined(OS_WIN) |
195 target_services_ = NULL; | 196 target_services_ = NULL; |
196 #endif | 197 #endif |
197 DCHECK(base::CommandLine::ForCurrentProcess()->HasSwitch( | 198 DCHECK(base::CommandLine::ForCurrentProcess()->HasSwitch( |
198 switches::kSingleProcess) || | 199 switches::kSingleProcess) || |
199 base::CommandLine::ForCurrentProcess()->HasSwitch( | 200 base::CommandLine::ForCurrentProcess()->HasSwitch( |
200 switches::kInProcessGPU)); | 201 switches::kInProcessGPU)); |
201 | 202 |
202 if (!gfx::GLSurface::InitializeOneOff()) | 203 if (!gl::init::InitializeGLOneOff()) |
203 VLOG(1) << "gfx::GLSurface::InitializeOneOff failed"; | 204 VLOG(1) << "gl::init::InitializeGLOneOff failed"; |
204 | 205 |
205 g_thread_safe_sender.Get() = thread_safe_sender(); | 206 g_thread_safe_sender.Get() = thread_safe_sender(); |
206 g_lazy_tls.Pointer()->Set(this); | 207 g_lazy_tls.Pointer()->Set(this); |
207 } | 208 } |
208 | 209 |
209 GpuChildThread::~GpuChildThread() { | 210 GpuChildThread::~GpuChildThread() { |
210 while (!deferred_messages_.empty()) { | 211 while (!deferred_messages_.empty()) { |
211 delete deferred_messages_.front(); | 212 delete deferred_messages_.front(); |
212 deferred_messages_.pop(); | 213 deferred_messages_.pop(); |
213 } | 214 } |
(...skipping 335 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
549 | 550 |
550 void GpuChildThread::BindProcessControlRequest( | 551 void GpuChildThread::BindProcessControlRequest( |
551 mojo::InterfaceRequest<mojom::ProcessControl> request) { | 552 mojo::InterfaceRequest<mojom::ProcessControl> request) { |
552 DVLOG(1) << "GPU: Binding ProcessControl request"; | 553 DVLOG(1) << "GPU: Binding ProcessControl request"; |
553 DCHECK(process_control_); | 554 DCHECK(process_control_); |
554 process_control_bindings_.AddBinding(process_control_.get(), | 555 process_control_bindings_.AddBinding(process_control_.get(), |
555 std::move(request)); | 556 std::move(request)); |
556 } | 557 } |
557 | 558 |
558 } // namespace content | 559 } // namespace content |
OLD | NEW |