| Index: ui/ozone/platform/dri/gbm_surface_factory.h
|
| diff --git a/ui/ozone/platform/dri/gbm_surface_factory.h b/ui/ozone/platform/dri/gbm_surface_factory.h
|
| index 786f77d0a730c45d9255f43beeff026ace440b29..a951d953735e8f7f33f78685ab561bab26d7d527 100644
|
| --- a/ui/ozone/platform/dri/gbm_surface_factory.h
|
| +++ b/ui/ozone/platform/dri/gbm_surface_factory.h
|
| @@ -25,28 +25,29 @@ class GbmSurfaceFactory : public DriSurfaceFactory {
|
| DriWindowDelegateManager* window_manager);
|
|
|
| // DriSurfaceFactory:
|
| - virtual intptr_t GetNativeDisplay() override;
|
| - virtual const int32_t* GetEGLSurfaceProperties(
|
| - const int32_t* desired_list) override;
|
| - virtual bool LoadEGLGLES2Bindings(
|
| + intptr_t GetNativeDisplay() override;
|
| + const int32_t* GetEGLSurfaceProperties(const int32_t* desired_list) override;
|
| + bool LoadEGLGLES2Bindings(
|
| AddGLLibraryCallback add_gl_library,
|
| SetGLGetProcAddressProcCallback set_gl_get_proc_address) override;
|
| - virtual scoped_ptr<ui::SurfaceOzoneEGL> CreateEGLSurfaceForWidget(
|
| + scoped_ptr<ui::SurfaceOzoneEGL> CreateEGLSurfaceForWidget(
|
| gfx::AcceleratedWidget w) override;
|
| - virtual scoped_ptr<SurfaceOzoneEGL> CreateSurfacelessEGLSurfaceForWidget(
|
| + scoped_ptr<SurfaceOzoneEGL> CreateSurfacelessEGLSurfaceForWidget(
|
| gfx::AcceleratedWidget widget) override;
|
| - virtual scoped_refptr<ui::NativePixmap> CreateNativePixmap(
|
| + scoped_refptr<ui::NativePixmap> CreateNativePixmap(
|
| gfx::Size size,
|
| - BufferFormat format) override;
|
| - virtual OverlayCandidatesOzone* GetOverlayCandidates(
|
| + BufferFormat format,
|
| + BufferUsage usage) override;
|
| + OverlayCandidatesOzone* GetOverlayCandidates(
|
| gfx::AcceleratedWidget w) override;
|
| - virtual bool ScheduleOverlayPlane(gfx::AcceleratedWidget widget,
|
| - int plane_z_order,
|
| - gfx::OverlayTransform plane_transform,
|
| - scoped_refptr<NativePixmap> buffer,
|
| - const gfx::Rect& display_bounds,
|
| - const gfx::RectF& crop_rect) override;
|
| - virtual bool CanShowPrimaryPlaneAsOverlay() override;
|
| + bool ScheduleOverlayPlane(gfx::AcceleratedWidget widget,
|
| + int plane_z_order,
|
| + gfx::OverlayTransform plane_transform,
|
| + scoped_refptr<NativePixmap> buffer,
|
| + const gfx::Rect& display_bounds,
|
| + const gfx::RectF& crop_rect) override;
|
| + bool CanShowPrimaryPlaneAsOverlay() override;
|
| + bool CanCreateNativePixmap(BufferUsage usage) override;
|
|
|
| private:
|
| DriWindowDelegate* GetOrCreateWindowDelegate(gfx::AcceleratedWidget widget);
|
|
|