| Index: services/ui/surfaces/display_output_surface.h
|
| diff --git a/services/ui/surfaces/direct_output_surface.h b/services/ui/surfaces/display_output_surface.h
|
| similarity index 84%
|
| rename from services/ui/surfaces/direct_output_surface.h
|
| rename to services/ui/surfaces/display_output_surface.h
|
| index a377039c7b0ec981f1d1a6001139d8db820965bf..4a0ef7770e06223fb5911f26a5f9c90747b3ecb4 100644
|
| --- a/services/ui/surfaces/direct_output_surface.h
|
| +++ b/services/ui/surfaces/display_output_surface.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_H_
|
| -#define SERVICES_UI_SURFACES_DIRECT_OUTPUT_SURFACE_H_
|
| +#ifndef SERVICES_UI_SURFACES_DISPLAY_OUTPUT_SURFACE_H_
|
| +#define SERVICES_UI_SURFACES_DISPLAY_OUTPUT_SURFACE_H_
|
|
|
| #include <memory>
|
|
|
| @@ -11,7 +11,6 @@
|
| #include "cc/output/output_surface.h"
|
|
|
| namespace cc {
|
| -class CompositorFrame;
|
| class SyntheticBeginFrameSource;
|
| }
|
|
|
| @@ -19,12 +18,12 @@ namespace ui {
|
|
|
| // An OutputSurface implementation that directly draws and
|
| // swaps to an actual GL surface.
|
| -class DirectOutputSurface : public cc::OutputSurface {
|
| +class DisplayOutputSurface : public cc::OutputSurface {
|
| public:
|
| - DirectOutputSurface(
|
| + DisplayOutputSurface(
|
| scoped_refptr<cc::InProcessContextProvider> context_provider,
|
| cc::SyntheticBeginFrameSource* synthetic_begin_frame_source);
|
| - ~DirectOutputSurface() override;
|
| + ~DisplayOutputSurface() override;
|
|
|
| // cc::OutputSurface implementation
|
| void BindToClient(cc::OutputSurfaceClient* client) override;
|
| @@ -44,7 +43,6 @@ class DirectOutputSurface : public cc::OutputSurface {
|
| bool HasExternalStencilTest() const override;
|
| void ApplyExternalStencil() override;
|
|
|
| -
|
| private:
|
| // Called when a swap completion is signaled from ImageTransportSurface.
|
| void OnGpuSwapBuffersCompleted(
|
| @@ -57,9 +55,9 @@ class DirectOutputSurface : public cc::OutputSurface {
|
| cc::OutputSurfaceClient* client_ = nullptr;
|
| cc::SyntheticBeginFrameSource* const synthetic_begin_frame_source_;
|
|
|
| - base::WeakPtrFactory<DirectOutputSurface> weak_ptr_factory_;
|
| + base::WeakPtrFactory<DisplayOutputSurface> weak_ptr_factory_;
|
| };
|
|
|
| } // namespace ui
|
|
|
| -#endif // SERVICES_UI_SURFACES_DIRECT_OUTPUT_SURFACE_H_
|
| +#endif // SERVICES_UI_SURFACES_DISPLAY_OUTPUT_SURFACE_H_
|
|
|