Mus: surfaces::CompositorFrameSink => DisplayCompositorFrameSink

services/ui/surfaces/display_compositor_frame_sink.cc

 // 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.
 
-#include "services/ui/surfaces/compositor_frame_sink.h"
+#include "services/ui/surfaces/display_compositor_frame_sink.h"
 
 #include "cc/output/copy_output_request.h"
 #include "cc/output/output_surface.h"
 #include "cc/output/renderer_settings.h"
 #include "cc/output/texture_mailbox_deleter.h"
 #include "cc/scheduler/begin_frame_source.h"
 #include "cc/scheduler/delay_based_time_source.h"
 #include "cc/surfaces/display.h"
 #include "cc/surfaces/display_scheduler.h"
 #include "cc/surfaces/frame_sink_id.h"
 #include "gpu/ipc/client/gpu_channel_host.h"
 #include "services/ui/surfaces/direct_output_surface.h"
 #include "services/ui/surfaces/surfaces_context_provider.h"
 
 #if defined(USE_OZONE)
 #include "gpu/command_buffer/client/gles2_interface.h"
 #include "services/ui/surfaces/direct_output_surface_ozone.h"
 #endif
 
 namespace ui {
-namespace surfaces {
 
-CompositorFrameSink::CompositorFrameSink(
+DisplayCompositorFrameSink::DisplayCompositorFrameSink(
     const cc::FrameSinkId& frame_sink_id,
     scoped_refptr<base::SingleThreadTaskRunner> task_runner,
     gfx::AcceleratedWidget widget,
     scoped_refptr<gpu::GpuChannelHost> gpu_channel,
     const scoped_refptr<DisplayCompositor>& display_compositor)
     : frame_sink_id_(frame_sink_id),
       task_runner_(task_runner),
       display_compositor_(display_compositor),
       factory_(frame_sink_id_, display_compositor->manager(), this) {
   display_compositor_->manager()->RegisterFrameSinkId(frame_sink_id_);
@@ skipping 35 matching lines @@
 
   display_.reset(new cc::Display(
       nullptr /* bitmap_manager */, gpu_memory_buffer_manager,
       cc::RendererSettings(), std::move(synthetic_begin_frame_source),
       std::move(display_output_surface), std::move(scheduler),
       base::MakeUnique<cc::TextureMailboxDeleter>(task_runner_.get())));
   display_->Initialize(this, display_compositor_->manager(), frame_sink_id_);
   display_->SetVisible(true);
 }
 
-CompositorFrameSink::~CompositorFrameSink() {
+DisplayCompositorFrameSink::~DisplayCompositorFrameSink() {
   display_compositor_->manager()->UnregisterSurfaceFactoryClient(
       frame_sink_id_);
   display_compositor_->manager()->InvalidateFrameSinkId(frame_sink_id_);
 }
 
-void CompositorFrameSink::SubmitCompositorFrame(
+void DisplayCompositorFrameSink::SubmitCompositorFrame(
     cc::CompositorFrame frame,
     const base::Callback<void()>& callback) {
   gfx::Size frame_size =
       frame.delegated_frame_data->render_pass_list.back()->output_rect.size();
   if (frame_size.IsEmpty() || frame_size != display_size_) {
     if (!local_frame_id_.is_null())
       factory_.Destroy(local_frame_id_);
     local_frame_id_ = allocator_.GenerateId();
     factory_.Create(local_frame_id_);
     display_size_ = frame_size;
     display_->Resize(display_size_);
   }
   display_->SetSurfaceId(cc::SurfaceId(frame_sink_id_, local_frame_id_),
                          frame.metadata.device_scale_factor);
   factory_.SubmitCompositorFrame(local_frame_id_, std::move(frame), callback);
 }
 
-void CompositorFrameSink::ReturnResources(
+void DisplayCompositorFrameSink::ReturnResources(
     const cc::ReturnedResourceArray& resources) {
   // TODO(fsamuel): Implement this.
 }
 
-void CompositorFrameSink::SetBeginFrameSource(
+void DisplayCompositorFrameSink::SetBeginFrameSource(
     cc::BeginFrameSource* begin_frame_source) {
   // TODO(fsamuel): Implement this.
 }
 
-void CompositorFrameSink::DisplayOutputSurfaceLost() {
+void DisplayCompositorFrameSink::DisplayOutputSurfaceLost() {
   // TODO(fsamuel): This looks like it would crash if a frame was in flight and
   // will be submitted.
   display_.reset();
 }
 
-void CompositorFrameSink::DisplayWillDrawAndSwap(
+void DisplayCompositorFrameSink::DisplayWillDrawAndSwap(
     bool will_draw_and_swap,
     const cc::RenderPassList& render_passes) {
   // This notification is not relevant to our client outside of tests.
 }
 
-void CompositorFrameSink::DisplayDidDrawAndSwap() {
+void DisplayCompositorFrameSink::DisplayDidDrawAndSwap() {
   // This notification is not relevant to our client outside of tests. We
   // unblock the client from the DrawCallback when the surface is going to
   // be drawn.
 }
 
-}  // namespace surfaces
 }  // namespace ui