Chromium Code Reviews| Index: ui/ozone/platform/dri/ozone_platform_gbm.cc |
| diff --git a/ui/ozone/platform/dri/ozone_platform_gbm.cc b/ui/ozone/platform/dri/ozone_platform_gbm.cc |
| index 3b417c205b64db4ff9a4668c42be4edfb906443d..9470f37de1360b9faa005492d9a84d1a8ae962ea 100644 |
| --- a/ui/ozone/platform/dri/ozone_platform_gbm.cc |
| +++ b/ui/ozone/platform/dri/ozone_platform_gbm.cc |
| @@ -19,6 +19,7 @@ |
| #include "ui/ozone/platform/dri/gbm_surface_factory.h" |
| #include "ui/ozone/platform/dri/gpu_platform_support_gbm.h" |
| #include "ui/ozone/platform/dri/gpu_platform_support_host_gbm.h" |
| +#include "ui/ozone/platform/dri/native_window_manager.h" |
| #include "ui/ozone/platform/dri/scanout_buffer.h" |
| #include "ui/ozone/platform/dri/screen_manager.h" |
| #include "ui/ozone/platform/dri/virtual_terminal_manager.h" |
| @@ -138,7 +139,9 @@ class OzonePlatformGbm : public OzonePlatform { |
| buffer_generator_->device(), |
| screen_manager_.get()); |
| gpu_platform_support_.reset( |
| - new GpuPlatformSupportGbm(surface_factory_ozone_.get())); |
| + new GpuPlatformSupportGbm(surface_factory_ozone_.get(), |
| + &gpu_window_manager_, |
| + screen_manager_.get())); |
| #if defined(OS_CHROMEOS) |
| gpu_platform_support_->AddHandler(scoped_ptr<GpuPlatformSupport>( |
| new DisplayMessageHandler( |
| @@ -167,6 +170,8 @@ class OzonePlatformGbm : public OzonePlatform { |
| scoped_ptr<GpuPlatformSupportGbm> gpu_platform_support_; |
| scoped_ptr<GpuPlatformSupportHostGbm> gpu_platform_support_host_; |
| + NativeWindowManager gpu_window_manager_; |
|
alexst (slow to review)
2014/08/18 17:43:47
Who owns this?
dnicoara
2014/08/18 18:55:25
OzonePlatformGbm ... the one created on the GPU pr
|
| + |
| DISALLOW_COPY_AND_ASSIGN(OzonePlatformGbm); |
| }; |