| 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..34d200076c74721681661222b814dca8de96d82d 100644
|
| --- a/content/gpu/gpu_child_thread.cc
|
| +++ b/content/gpu/gpu_child_thread.cc
|
| @@ -19,6 +19,11 @@
|
| #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"
|
| +#include "ui/ozone/ozone_platform.h"
|
| +#endif
|
| +
|
| namespace content {
|
| namespace {
|
|
|
| @@ -113,6 +118,13 @@ bool GpuChildThread::OnControlMessageReceived(const IPC::Message& msg) {
|
| if (handled)
|
| return true;
|
|
|
| +#if defined(USE_OZONE)
|
| + if (ui::OzonePlatform::GetInstance()
|
| + ->GetGpuPlatformSupport()
|
| + ->OnMessageReceived(msg))
|
| + return true;
|
| +#endif
|
| +
|
| return gpu_channel_manager_.get() &&
|
| gpu_channel_manager_->OnMessageReceived(msg);
|
| }
|
| @@ -152,6 +164,12 @@ void GpuChildThread::OnInitialize() {
|
| watchdog_thread_.get(),
|
| ChildProcess::current()->io_message_loop_proxy(),
|
| ChildProcess::current()->GetShutDownEvent()));
|
| +
|
| +#if defined(USE_OZONE)
|
| + ui::OzonePlatform::GetInstance()
|
| + ->GetGpuPlatformSupport()
|
| + ->OnChannelEstablished(this);
|
| +#endif
|
| }
|
|
|
| void GpuChildThread::StopWatchdog() {
|
|
|