| Index: content/gpu/gpu_child_thread.cc
|
| diff --git a/content/gpu/gpu_child_thread.cc b/content/gpu/gpu_child_thread.cc
|
| index b6112200bdb1215e7ff62991677e305fae4e50c3..8267d1f456929cf93b107ff07aefeb093f929fc0 100644
|
| --- a/content/gpu/gpu_child_thread.cc
|
| +++ b/content/gpu/gpu_child_thread.cc
|
| @@ -163,6 +163,7 @@ GpuChildThread::GpuChildThread(
|
|
|
| GpuChildThread::GpuChildThread(
|
| const InProcessChildThreadParams& params,
|
| + const gpu::GPUInfo& gpu_info,
|
| gpu::GpuMemoryBufferFactory* gpu_memory_buffer_factory)
|
| : ChildThreadImpl(ChildThreadImpl::Options::Builder()
|
| .InBrowserProcess(params)
|
| @@ -172,6 +173,7 @@ GpuChildThread::GpuChildThread(
|
| .ConnectToBrowser(true)
|
| .Build()),
|
| dead_on_arrival_(false),
|
| + gpu_info_(gpu_info),
|
| in_browser_process_(true),
|
| gpu_memory_buffer_factory_(gpu_memory_buffer_factory) {
|
| #if defined(OS_WIN)
|
| @@ -182,9 +184,6 @@ GpuChildThread::GpuChildThread(
|
| base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| switches::kInProcessGPU));
|
|
|
| - if (!gl::init::InitializeGLOneOff())
|
| - VLOG(1) << "gl::init::InitializeGLOneOff failed";
|
| -
|
| g_thread_safe_sender.Get() = thread_safe_sender();
|
| }
|
|
|
|
|