Mus: DirectOutputSurface* => DisplayOutputSurface*

services/ui/surfaces/direct_output_surface_ozone.h

Index: services/ui/surfaces/direct_output_surface_ozone.h
diff --git a/services/ui/surfaces/direct_output_surface_ozone.h b/services/ui/surfaces/direct_output_surface_ozone.h
deleted file mode 100644
index c6b81d63d66d9f04b44a08949fa7def6155b5586..0000000000000000000000000000000000000000
--- a/services/ui/surfaces/direct_output_surface_ozone.h
+++ /dev/null
@@ -1,94 +0,0 @@
-// Copyright 2016 The Chromium Authors. All rights reserved.
-// 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_
-
-#include <memory>
-
-#include "base/memory/weak_ptr.h"
-#include "cc/output/context_provider.h"
-#include "cc/output/in_process_context_provider.h"
-#include "cc/output/output_surface.h"
-#include "components/display_compositor/gl_helper.h"
-#include "ui/gfx/geometry/size.h"
-#include "ui/gfx/native_widget_types.h"
-#include "ui/gfx/swap_result.h"
-#include "ui/gl/gl_surface.h"
-
-namespace cc {
-class CompositorFrame;
-class SyntheticBeginFrameSource;
-}
-
-namespace display_compositor {
-class BufferQueue;
-}
-
-namespace gpu {
-class GpuMemoryBufferManager;
-}
-
-namespace ui {
-
-// An OutputSurface implementation that directly draws and swap to a GL
-// "surfaceless" surface (aka one backed by a buffer managed explicitly in
-// mus/ozone. This class is adapted from
-// GpuSurfacelessBrowserCompositorOutputSurface.
-class DirectOutputSurfaceOzone : public cc::OutputSurface {
- public:
-  DirectOutputSurfaceOzone(
-      scoped_refptr<cc::InProcessContextProvider> context_provider,
-      gfx::AcceleratedWidget widget,
-      cc::SyntheticBeginFrameSource* synthetic_begin_frame_source,
-      gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
-      uint32_t target,
-      uint32_t internalformat);
-
-  ~DirectOutputSurfaceOzone() override;
-
-  // TODO(rjkroege): Implement the equivalent of Reflector.
-
- private:
-  // cc::OutputSurface implementation.
-  void BindToClient(cc::OutputSurfaceClient* client) override;
-  void EnsureBackbuffer() override;
-  void DiscardBackbuffer() override;
-  void BindFramebuffer() override;
-  void Reshape(const gfx::Size& size,
-               float device_scale_factor,
-               const gfx::ColorSpace& color_space,
-               bool has_alpha) override;
-  void SwapBuffers(cc::OutputSurfaceFrame frame) override;
-  uint32_t GetFramebufferCopyTextureFormat() override;
-  cc::OverlayCandidateValidator* GetOverlayCandidateValidator() const override;
-  bool IsDisplayedAsOverlayPlane() const override;
-  unsigned GetOverlayTextureId() const override;
-  bool SurfaceIsSuspendForRecycle() const override;
-  bool HasExternalStencilTest() const override;
-  void ApplyExternalStencil() override;
-
-  // Called when a swap completion is signaled from ImageTransportSurface.
-  void OnGpuSwapBuffersCompleted(
-      const std::vector<ui::LatencyInfo>& latency_info,
-      gfx::SwapResult result,
-      const gpu::GpuProcessHostedCALayerTreeParamsMac* params_mac);
-  void OnVSyncParametersUpdated(base::TimeTicks timebase,
-                                base::TimeDelta interval);
-
-  cc::OutputSurfaceClient* client_ = nullptr;
-
-  display_compositor::GLHelper gl_helper_;
-  std::unique_ptr<display_compositor::BufferQueue> buffer_queue_;
-  cc::SyntheticBeginFrameSource* const synthetic_begin_frame_source_;
-
-  gfx::Size reshape_size_;
-  gfx::Size swap_size_;
-
-  base::WeakPtrFactory<DirectOutputSurfaceOzone> weak_ptr_factory_;
-};
-
-}  // namespace ui
-
-#endif  // SERVICES_UI_SURFACES_DIRECT_OUTPUT_SURFACE_OZONE_H_