[WIP] Pass the single_process parameter to Ozone's initialization functions

content/gpu/gpu_child_thread.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/gpu/gpu_child_thread.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 164 matching lines @@
       in_browser_process_(true),
       gpu_memory_buffer_factory_(gpu_memory_buffer_factory) {
 #if defined(OS_WIN)
   target_services_ = NULL;
 #endif
   DCHECK(base::CommandLine::ForCurrentProcess()->HasSwitch(
              switches::kSingleProcess) ||
          base::CommandLine::ForCurrentProcess()->HasSwitch(
              switches::kInProcessGPU));
 
+#if defined(USE_OZONE)

[rjkroege, 2016/09/12 20:39:12]

you shouldn't need this here.

[fwang, 2016/09/13 13:49:19]

There is a comment in gpu_main.cc:

"With in-process GPU, gl::init::InitializeGLOneOff() is called from
GpuChildThread before getting here."

Indeed, in that case the InitializeGLOneOff call here happens before the one in
gpu_main.cc and hence will crash without the InitializeForGPU call added here.

+  ui::OzonePlatform::InitParams ozoneInitParams;
+  ozoneInitParams.connector = nullptr;
+  ozoneInitParams.single_process = true;
+  ui::OzonePlatform::InitializeForGPU(ozoneInitParams);
+#endif
+
   if (!gl::init::InitializeGLOneOff())
     VLOG(1) << "gl::init::InitializeGLOneOff failed";
 
   g_thread_safe_sender.Get() = thread_safe_sender();
 }
 
 GpuChildThread::~GpuChildThread() {
   while (!deferred_messages_.empty()) {
     delete deferred_messages_.front();
     deferred_messages_.pop();
@@ skipping 349 matching lines @@
 
 void GpuChildThread::BindServiceFactoryRequest(
     shell::mojom::ServiceFactoryRequest request) {
   DVLOG(1) << "GPU: Binding shell::mojom::ServiceFactoryRequest";
   DCHECK(service_factory_);
   service_factory_bindings_.AddBinding(service_factory_.get(),
                                        std::move(request));
 }
 
 }  // namespace content