Index: content/gpu/gpu_child_thread.cc |
diff --git a/content/gpu/gpu_child_thread.cc b/content/gpu/gpu_child_thread.cc |
index 74864cbd35062f711a54fdf7adeb45f8e7d78f32..7ac132edfe9ace8f36308d258f3a6cafe0332eaf 100644 |
--- a/content/gpu/gpu_child_thread.cc |
+++ b/content/gpu/gpu_child_thread.cc |
@@ -19,6 +19,10 @@ |
#include "ipc/ipc_sync_message_filter.h" |
#include "ui/gl/gl_implementation.h" |
+#if defined(USE_OZONE) |
+#include "ui/ozone/gpu/gpu_platform_support.h" |
+#endif |
+ |
namespace content { |
namespace { |
@@ -52,6 +56,9 @@ GpuChildThread::GpuChildThread(GpuWatchdogThread* watchdog_thread, |
#if defined(OS_WIN) |
target_services_ = NULL; |
#endif |
+#if defined(USE_OZONE) |
+ ui::GpuPlatformSupport::Initialize(); |
+#endif |
g_thread_safe_sender.Get() = thread_safe_sender(); |
} |
@@ -113,6 +120,11 @@ bool GpuChildThread::OnControlMessageReceived(const IPC::Message& msg) { |
if (handled) |
return true; |
+#if defined(USE_OZONE) |
+ if (ui::GpuPlatformSupport::GetInstance()->OnMessageReceived(msg)) |
+ return true; |
+#endif |
+ |
return gpu_channel_manager_.get() && |
gpu_channel_manager_->OnMessageReceived(msg); |
} |
@@ -152,6 +164,10 @@ void GpuChildThread::OnInitialize() { |
watchdog_thread_.get(), |
ChildProcess::current()->io_message_loop_proxy(), |
ChildProcess::current()->GetShutDownEvent())); |
+ |
+#if defined(USE_OZONE) |
+ ui::GpuPlatformSupport::GetInstance()->OnChannelEstablished(this); |
+#endif |
} |
void GpuChildThread::StopWatchdog() { |