Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(577)

Unified Diff: gpu/ipc/service/gpu_init.cc

Issue 2342003003: [WIP] Mus: Pass the mojo connector to OzonePlatform::InitializeForGPU (Closed)
Patch Set: Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gpu/ipc/service/gpu_init.h ('k') | services/ui/gpu/gpu_main.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/ipc/service/gpu_init.cc
diff --git a/gpu/ipc/service/gpu_init.cc b/gpu/ipc/service/gpu_init.cc
index 2af73234148c4563f40ca4559d185e4fa96d9352..64735e75d53e7b8817ff540f97082447369d9011 100644
--- a/gpu/ipc/service/gpu_init.cc
+++ b/gpu/ipc/service/gpu_init.cc
@@ -21,6 +21,10 @@
#include "ui/gl/gl_switches.h"
#include "ui/gl/init/gl_factory.h"
+#if defined(USE_OZONE)
+#include "ui/ozone/public/ozone_platform.h"
+#endif
+
namespace gpu {
namespace {
@@ -114,7 +118,8 @@ GpuInit::GpuInit() {}
GpuInit::~GpuInit() {}
-bool GpuInit::InitializeAndStartSandbox(const base::CommandLine& command_line) {
+bool GpuInit::InitializeAndStartSandbox(const base::CommandLine& command_line,
+ shell::Connector* connector) {
if (command_line.HasSwitch(switches::kSupportsDualGpus)) {
std::set<int> workarounds;
gpu::GpuDriverBugList::AppendWorkaroundsFromCommandLine(&workarounds,
@@ -169,6 +174,12 @@ bool GpuInit::InitializeAndStartSandbox(const base::CommandLine& command_line) {
base::TimeTicks before_initialize_one_off = base::TimeTicks::Now();
+#if defined(USE_OZONE)
+ ui::OzonePlatform::InitParams ozoneInitParams;
+ ozoneInitParams.connector = connector;
+ ui::OzonePlatform::InitializeForGPU(ozoneInitParams);
+#endif
+
// Load and initialize the GL implementation and locate the GL entry points if
// needed. This initialization may have already happened if running in the
// browser process, for example.
« no previous file with comments | « gpu/ipc/service/gpu_init.h ('k') | services/ui/gpu/gpu_main.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698