From 1e8f9b668e2ac64714ffb8709553c1d60abe6ff5 Mon Sep 17 00:00:00 2001
From: Andras Becsi <andras.becsi@theqtcompany.com>
Date: Thu, 27 Aug 2015 17:43:05 +0200
Subject: [PATCH] Fix embedded build after the update to 45-based branch
Add missing virtual function implementation.
Change-Id: Icad8fee6306c742530f1890d14e941e686dc1253
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
---
src/core/ozone_platform_eglfs.cpp | 6 ++++++
src/core/ozone_platform_eglfs.h | 2 ++
2 files changed, 8 insertions(+)
diff --git a/src/core/ozone_platform_eglfs.cpp b/src/core/ozone_platform_eglfs.cpp
index 9dca83685..834e41fdf 100644
--- a/src/core/ozone_platform_eglfs.cpp
+++ b/src/core/ozone_platform_eglfs.cpp
@@ -45,6 +45,7 @@
#include "ui/events/ozone/events_ozone.h"
#include "ui/events/platform/platform_event_dispatcher.h"
#include "ui/ozone/common/native_display_delegate_ozone.h"
+#include "ui/ozone/common/stub_overlay_manager.h"
#include "ui/ozone/public/ozone_platform.h"
#include "ui/ozone/public/cursor_factory_ozone.h"
#include "ui/ozone/public/gpu_platform_support.h"
@@ -169,6 +170,10 @@ scoped_ptr<ui::SystemInputInjector> OzonePlatformEglfs::CreateSystemInputInjecto
return nullptr; // no input injection support.
}
+ui::OverlayManagerOzone* OzonePlatformEglfs::GetOverlayManager() {
+ return overlay_manager_.get();
+}
+
scoped_ptr<ui::NativeDisplayDelegate> OzonePlatformEglfs::CreateNativeDisplayDelegate()
{
return scoped_ptr<NativeDisplayDelegate>(new NativeDisplayDelegateOzone());
@@ -177,6 +182,7 @@ scoped_ptr<ui::NativeDisplayDelegate> OzonePlatformEglfs::CreateNativeDisplayDel
OzonePlatform* CreateOzonePlatformEglfs() { return new OzonePlatformEglfs; }
void OzonePlatformEglfs::InitializeUI() {
+ overlay_manager_.reset(new StubOverlayManager());
device_manager_ = CreateDeviceManager();
cursor_factory_ozone_.reset(new CursorFactoryOzone());
event_factory_ozone_.reset(new EventFactoryEvdev(NULL, device_manager_.get(), NULL));
diff --git a/src/core/ozone_platform_eglfs.h b/src/core/ozone_platform_eglfs.h
index ae95fa8eb..69ff2508f 100644
--- a/src/core/ozone_platform_eglfs.h
+++ b/src/core/ozone_platform_eglfs.h
@@ -64,6 +64,7 @@ class OzonePlatformEglfs : public OzonePlatform {
virtual scoped_ptr<ui::NativeDisplayDelegate> CreateNativeDisplayDelegate() override;
virtual ui::InputController* GetInputController() override;
virtual scoped_ptr<ui::SystemInputInjector> CreateSystemInputInjector() override;
+ virtual ui::OverlayManagerOzone* GetOverlayManager() override;
private:
virtual void InitializeUI() override;
@@ -77,6 +78,7 @@ class OzonePlatformEglfs : public OzonePlatform {
scoped_ptr<GpuPlatformSupport> gpu_platform_support_;
scoped_ptr<GpuPlatformSupportHost> gpu_platform_support_host_;
scoped_ptr<InputController> input_controller_;
+ scoped_ptr<OverlayManagerOzone> overlay_manager_;
DISALLOW_COPY_AND_ASSIGN(OzonePlatformEglfs);
};
--
GitLab