diff options
author | Zeno Albisser <zeno.albisser@digia.com> | 2014-09-11 07:48:34 -0700 |
---|---|---|
committer | Zeno Albisser <zeno.albisser@digia.com> | 2014-10-06 20:34:13 +0200 |
commit | 440031320bfc90c4daf481d71341489c88357f9e (patch) | |
tree | 8fd6d1afb5f2547ac225b4212c4c97590675185c /src/core/ozone_platform_eglfs.h | |
parent | 786b29cf7f843981ff64f2f6326dba5b03e3c9e6 (diff) |
Update OzonePlatformEglfs after update to Chromium 37.
The Ozone platform base class has received several
new pure virtual functions that needed to be implemented.
Most of the functions are implemented according to
how it is done in OzonePlatformGbm.
Change-Id: Ibab75ae0891b67d03f705da611949ed6cf75ad9f
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'src/core/ozone_platform_eglfs.h')
-rw-r--r-- | src/core/ozone_platform_eglfs.h | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/src/core/ozone_platform_eglfs.h b/src/core/ozone_platform_eglfs.h index 4dcc419a6..9d96688a5 100644 --- a/src/core/ozone_platform_eglfs.h +++ b/src/core/ozone_platform_eglfs.h @@ -51,12 +51,23 @@ class OzonePlatformEglfs : public OzonePlatform { OzonePlatformEglfs(); virtual ~OzonePlatformEglfs(); - virtual gfx::SurfaceFactoryOzone* GetSurfaceFactoryOzone() OVERRIDE; + virtual ui::SurfaceFactoryOzone* GetSurfaceFactoryOzone() OVERRIDE; virtual ui::EventFactoryOzone* GetEventFactoryOzone() OVERRIDE; + virtual ui::CursorFactoryOzone* GetCursorFactoryOzone() OVERRIDE; + virtual GpuPlatformSupport* GetGpuPlatformSupport() OVERRIDE; + virtual GpuPlatformSupportHost* GetGpuPlatformSupportHost() OVERRIDE; + virtual void InitializeUI() OVERRIDE; + virtual void InitializeGPU() OVERRIDE; private: - SurfaceFactoryQt surface_factory_ozone_; - ui::EventFactoryEvdev event_factory_ozone_; + scoped_ptr<DeviceManager> device_manager_; + + scoped_ptr<SurfaceFactoryQt> surface_factory_ozone_; + scoped_ptr<ui::CursorFactoryOzone> cursor_factory_ozone_; + scoped_ptr<ui::EventFactoryEvdev> event_factory_ozone_; + + scoped_ptr<GpuPlatformSupport> gpu_platform_support_; + scoped_ptr<GpuPlatformSupportHost> gpu_platform_support_host_; DISALLOW_COPY_AND_ASSIGN(OzonePlatformEglfs); }; |