diff options
Diffstat (limited to 'src/core/ozone_platform_eglfs.h')
-rw-r--r-- | src/core/ozone_platform_eglfs.h | 48 |
1 files changed, 27 insertions, 21 deletions
diff --git a/src/core/ozone_platform_eglfs.h b/src/core/ozone_platform_eglfs.h index 9d96688a5..6954595dd 100644 --- a/src/core/ozone_platform_eglfs.h +++ b/src/core/ozone_platform_eglfs.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the QtWebEngine module of the Qt Toolkit. ** @@ -10,15 +10,15 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser ** General Public License version 3 as published by the Free Software ** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to +** packaging of this file. Please review the following information to ** ensure the GNU Lesser General Public License version 3 requirements ** will be met: https://www.gnu.org/licenses/lgpl.html. ** @@ -26,7 +26,7 @@ ** Alternatively, this file may be used under the terms of the GNU ** General Public License version 2.0 or later as published by the Free ** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to +** the packaging of this file. Please review the following information to ** ensure the GNU General Public License version 2.0 requirements will be ** met: http://www.gnu.org/licenses/gpl-2.0.html. ** @@ -37,34 +37,40 @@ #ifndef UI_OZONE_PLATFORM_EGLFS_OZONE_PLATFORM_EGLFS_H_ #define UI_OZONE_PLATFORM_EGLFS_OZONE_PLATFORM_EGLFS_H_ -#include "ui/events/ozone/evdev/event_factory_evdev.h" -#include "ui/ozone/ozone_platform.h" +#if defined(USE_OZONE) -#include "surface_factory_qt.h" +#include "ui/ozone/public/ozone_platform.h" -#if defined(USE_OZONE) +#include "surface_factory_qt.h" namespace ui { +class DeviceManager; +class EventFactoryEvdev; +class CursorFactoryOzone; + class OzonePlatformEglfs : public OzonePlatform { public: OzonePlatformEglfs(); virtual ~OzonePlatformEglfs(); - 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; + virtual ui::SurfaceFactoryOzone* GetSurfaceFactoryOzone() override; + virtual ui::CursorFactoryOzone* GetCursorFactoryOzone() override; + virtual GpuPlatformSupport* GetGpuPlatformSupport() override; + virtual GpuPlatformSupportHost* GetGpuPlatformSupportHost() override; + virtual scoped_ptr<PlatformWindow> CreatePlatformWindow( + PlatformWindowDelegate* delegate, + const gfx::Rect& bounds) override; + virtual scoped_ptr<ui::NativeDisplayDelegate> CreateNativeDisplayDelegate() override; private: + virtual void InitializeUI() override; + virtual void InitializeGPU() override; 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<QtWebEngineCore::SurfaceFactoryQt> surface_factory_ozone_; + scoped_ptr<CursorFactoryOzone> cursor_factory_ozone_; + scoped_ptr<EventFactoryEvdev> event_factory_ozone_; scoped_ptr<GpuPlatformSupport> gpu_platform_support_; scoped_ptr<GpuPlatformSupportHost> gpu_platform_support_host_; |