| Index: services/ui/surfaces/display_output_surface_ozone.h
|
| diff --git a/services/ui/surfaces/direct_output_surface_ozone.h b/services/ui/surfaces/display_output_surface_ozone.h
|
| similarity index 87%
|
| rename from services/ui/surfaces/direct_output_surface_ozone.h
|
| rename to services/ui/surfaces/display_output_surface_ozone.h
|
| index c6b81d63d66d9f04b44a08949fa7def6155b5586..03c50d78f4b1c40a2d4835780fcec1435edffdf0 100644
|
| --- a/services/ui/surfaces/direct_output_surface_ozone.h
|
| +++ b/services/ui/surfaces/display_output_surface_ozone.h
|
| @@ -2,8 +2,8 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef SERVICES_UI_SURFACES_DIRECT_OUTPUT_SURFACE_OZONE_H_
|
| -#define SERVICES_UI_SURFACES_DIRECT_OUTPUT_SURFACE_OZONE_H_
|
| +#ifndef SERVICES_UI_SURFACES_DISPLAY_OUTPUT_SURFACE_OZONE_H_
|
| +#define SERVICES_UI_SURFACES_DISPLAY_OUTPUT_SURFACE_OZONE_H_
|
|
|
| #include <memory>
|
|
|
| @@ -18,7 +18,6 @@
|
| #include "ui/gl/gl_surface.h"
|
|
|
| namespace cc {
|
| -class CompositorFrame;
|
| class SyntheticBeginFrameSource;
|
| }
|
|
|
| @@ -36,9 +35,9 @@ namespace ui {
|
| // "surfaceless" surface (aka one backed by a buffer managed explicitly in
|
| // mus/ozone. This class is adapted from
|
| // GpuSurfacelessBrowserCompositorOutputSurface.
|
| -class DirectOutputSurfaceOzone : public cc::OutputSurface {
|
| +class DisplayOutputSurfaceOzone : public cc::OutputSurface {
|
| public:
|
| - DirectOutputSurfaceOzone(
|
| + DisplayOutputSurfaceOzone(
|
| scoped_refptr<cc::InProcessContextProvider> context_provider,
|
| gfx::AcceleratedWidget widget,
|
| cc::SyntheticBeginFrameSource* synthetic_begin_frame_source,
|
| @@ -46,7 +45,7 @@ class DirectOutputSurfaceOzone : public cc::OutputSurface {
|
| uint32_t target,
|
| uint32_t internalformat);
|
|
|
| - ~DirectOutputSurfaceOzone() override;
|
| + ~DisplayOutputSurfaceOzone() override;
|
|
|
| // TODO(rjkroege): Implement the equivalent of Reflector.
|
|
|
| @@ -86,9 +85,9 @@ class DirectOutputSurfaceOzone : public cc::OutputSurface {
|
| gfx::Size reshape_size_;
|
| gfx::Size swap_size_;
|
|
|
| - base::WeakPtrFactory<DirectOutputSurfaceOzone> weak_ptr_factory_;
|
| + base::WeakPtrFactory<DisplayOutputSurfaceOzone> weak_ptr_factory_;
|
| };
|
|
|
| } // namespace ui
|
|
|
| -#endif // SERVICES_UI_SURFACES_DIRECT_OUTPUT_SURFACE_OZONE_H_
|
| +#endif // SERVICES_UI_SURFACES_DISPLAY_OUTPUT_SURFACE_OZONE_H_
|
|
|