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

Unified Diff: ui/ozone/public/ozone_platform.cc

Issue 2629983002: Fix the MessageLoop type in case more than one ozone platform is built (Closed)
Patch Set: addressed kbr's feedback Created 3 years, 10 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 | « ui/ozone/public/ozone_platform.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/ozone/public/ozone_platform.cc
diff --git a/ui/ozone/public/ozone_platform.cc b/ui/ozone/public/ozone_platform.cc
index 6f25a1b12ead6e06b2230a137bee70503b79d28c..b723460a575fca2fc615afb2d64ceeb5d81c4221 100644
--- a/ui/ozone/public/ozone_platform.cc
+++ b/ui/ozone/public/ozone_platform.cc
@@ -40,7 +40,7 @@ void OzonePlatform::InitializeForUI() {
// static
void OzonePlatform::InitializeForUI(const InitParams& args) {
- CreateInstance();
+ EnsureInstance();
if (g_platform_initialized_ui)
return;
g_platform_initialized_ui = true;
@@ -58,7 +58,7 @@ void OzonePlatform::InitializeForGPU() {
// static
void OzonePlatform::InitializeForGPU(const InitParams& args) {
- CreateInstance();
+ EnsureInstance();
if (g_platform_initialized_gpu)
return;
g_platform_initialized_gpu = true;
@@ -72,7 +72,7 @@ OzonePlatform* OzonePlatform::GetInstance() {
}
// static
-void OzonePlatform::CreateInstance() {
+OzonePlatform* OzonePlatform::EnsureInstance() {
if (!instance_) {
TRACE_EVENT1("ozone",
"OzonePlatform::Initialize",
@@ -85,6 +85,7 @@ void OzonePlatform::CreateInstance() {
OzonePlatform* pl = platform.release();
DCHECK_EQ(instance_, pl);
}
+ return instance_;
}
// static
@@ -94,6 +95,7 @@ OzonePlatform* OzonePlatform::instance_;
void OzonePlatform::InitializeUI(const InitParams& args) {
InitializeUI();
}
+
void OzonePlatform::InitializeGPU(const InitParams& args) {
InitializeGPU();
}
@@ -101,6 +103,11 @@ void OzonePlatform::InitializeGPU(const InitParams& args) {
IPC::MessageFilter* OzonePlatform::GetGpuMessageFilter() {
return nullptr;
}
+
+base::MessageLoop::Type OzonePlatform::GetMessageLoopTypeForGpu() {
+ return base::MessageLoop::TYPE_DEFAULT;
+}
+
void OzonePlatform::AddInterfaces(
service_manager::InterfaceRegistry* registry) {}
« no previous file with comments | « ui/ozone/public/ozone_platform.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698