Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(359)

Unified Diff: ui/ozone/platform/egltest/ozone_platform_egltest.cc

Issue 275263002: [wip] ozonex: X11 backend for ozone. Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: tot-merge Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/ozone/platform/dri/dri_surface_factory.cc ('k') | ui/ozone/platform/ozonex/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/ozone/platform/egltest/ozone_platform_egltest.cc
diff --git a/ui/ozone/platform/egltest/ozone_platform_egltest.cc b/ui/ozone/platform/egltest/ozone_platform_egltest.cc
index 8114cb98f5c78f4b2cbd5b829e382a378e16c198..6b4d0deb56727b435144d8f6d79fa236a17ddc58 100644
--- a/ui/ozone/platform/egltest/ozone_platform_egltest.cc
+++ b/ui/ozone/platform/egltest/ozone_platform_egltest.cc
@@ -93,7 +93,7 @@ class SurfaceFactoryEgltest : public gfx::SurfaceFactoryOzone {
virtual HardwareState InitializeHardware() OVERRIDE;
virtual void ShutdownHardware() OVERRIDE;
virtual intptr_t GetNativeDisplay() OVERRIDE;
- virtual gfx::AcceleratedWidget GetAcceleratedWidget() OVERRIDE;
+ virtual intptr_t CreatePlatformWindow(ui::PlatformWindowDelegate*) OVERRIDE;
virtual scoped_ptr<gfx::SurfaceOzoneEGL> CreateEGLSurfaceForWidget(
gfx::AcceleratedWidget widget) OVERRIDE;
virtual const int32* GetEGLSurfaceProperties(
@@ -131,7 +131,8 @@ intptr_t SurfaceFactoryEgltest::GetNativeDisplay() {
return eglplatform_shim_->ShimGetNativeDisplay();
}
-gfx::AcceleratedWidget SurfaceFactoryEgltest::GetAcceleratedWidget() {
+intptr_t SurfaceFactoryEgltest::CreatePlatformWindow(
+ ui::PlatformWindowDelegate* delegate) {
if (window_id_ == SHIM_NO_WINDOW_ID && !CreateSingleWindow())
LOG(FATAL) << "failed to create window";
return window_id_;
« no previous file with comments | « ui/ozone/platform/dri/dri_surface_factory.cc ('k') | ui/ozone/platform/ozonex/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698