diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-01-25 15:09:31 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-03-01 12:06:20 +0000 |
commit | ab94349cb2fa073e8aec661a797de1cfc3819752 (patch) | |
tree | d3525f63aa9b3ff041989d5cf981e0ee8b07d77d /src/core/ozone_platform_eglfs.cpp | |
parent | cb6564b11ea0a81155b59ab178ff75148017a952 (diff) |
Simple adaptations to Chromium 55
The simplest adaptations to API and build changes in Chromium 55
Change-Id: I923fa188690a04902492317807f72f006bcab9c6
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'src/core/ozone_platform_eglfs.cpp')
-rw-r--r-- | src/core/ozone_platform_eglfs.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/core/ozone_platform_eglfs.cpp b/src/core/ozone_platform_eglfs.cpp index 0b560da6c..e6e1ab5e2 100644 --- a/src/core/ozone_platform_eglfs.cpp +++ b/src/core/ozone_platform_eglfs.cpp @@ -52,7 +52,6 @@ #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" #include "ui/ozone/public/gpu_platform_support_host.h" #include "ui/platform_window/platform_window.h" #include "ui/platform_window/platform_window_delegate.h" @@ -140,10 +139,6 @@ ui::CursorFactoryOzone* OzonePlatformEglfs::GetCursorFactoryOzone() { return cursor_factory_ozone_.get(); } -GpuPlatformSupport* OzonePlatformEglfs::GetGpuPlatformSupport() { - return gpu_platform_support_.get(); -} - GpuPlatformSupportHost* OzonePlatformEglfs::GetGpuPlatformSupportHost() { return gpu_platform_support_host_.get(); } @@ -186,13 +181,12 @@ void OzonePlatformEglfs::InitializeUI() { device_manager_ = CreateDeviceManager(); cursor_factory_ozone_.reset(new CursorFactoryOzone()); event_factory_ozone_.reset(new EventFactoryEvdev(NULL, device_manager_.get(), NULL)); - gpu_platform_support_host_.reset(CreateStubGpuPlatformSupportHost()); + gpu_platform_support_host_.reset(ui::CreateStubGpuPlatformSupportHost()); input_controller_ = CreateStubInputController(); } void OzonePlatformEglfs::InitializeGPU() { surface_factory_ozone_.reset(new QtWebEngineCore::SurfaceFactoryQt()); - gpu_platform_support_.reset(CreateStubGpuPlatformSupport()); } } // namespace ui |