Move DisplayCompositor code to new component.

components/frame_sinks/display_compositor.cc

 // Copyright 2015 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/display_compositor.h"
+#include "components/frame_sinks/display_compositor.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/memory/ptr_util.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "cc/base/switches.h"
 #include "cc/output/in_process_context_provider.h"
 #include "cc/output/texture_mailbox_deleter.h"
 #include "cc/surfaces/display.h"
 #include "cc/surfaces/display_scheduler.h"
 #include "cc/surfaces/surface.h"
-#include "components/display_compositor/gpu_compositor_frame_sink.h"
-#include "components/display_compositor/gpu_root_compositor_frame_sink.h"
+#include "components/frame_sinks/gpu_compositor_frame_sink.h"
+#include "components/frame_sinks/gpu_root_compositor_frame_sink.h"
 #include "gpu/command_buffer/client/shared_memory_limits.h"
 #include "gpu/ipc/gpu_in_process_thread_service.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "services/ui/surfaces/display_output_surface.h"
 
 #if defined(USE_OZONE)
 #include "gpu/command_buffer/client/gles2_interface.h"
 #include "services/ui/surfaces/display_output_surface_ozone.h"
 #endif
 
-namespace ui {
+namespace frame_sinks {
 
 DisplayCompositor::DisplayCompositor(
     scoped_refptr<gpu::InProcessCommandBuffer::Service> gpu_service,
     std::unique_ptr<gpu::GpuMemoryBufferManager> gpu_memory_buffer_manager,
     gpu::ImageFactory* image_factory,
     cc::mojom::DisplayCompositorRequest request,
     cc::mojom::DisplayCompositorClientPtr client)
     : manager_(cc::SurfaceManager::LifetimeType::REFERENCES),
       gpu_service_(std::move(gpu_service)),
       gpu_memory_buffer_manager_(std::move(gpu_memory_buffer_manager)),
@@ skipping 30 matching lines @@
   // synchronization is enabled.
   if (!manager_.dependency_tracker() &&
       base::CommandLine::ForCurrentProcess()->HasSwitch(
           cc::switches::kEnableSurfaceSynchronization)) {
     std::unique_ptr<cc::SurfaceDependencyTracker> dependency_tracker(
         new cc::SurfaceDependencyTracker(&manager_, begin_frame_source.get()));
     manager_.SetDependencyTracker(std::move(dependency_tracker));
   }
 
   compositor_frame_sinks_[frame_sink_id] =
-      base::MakeUnique<display_compositor::GpuRootCompositorFrameSink>(
+      base::MakeUnique<GpuRootCompositorFrameSink>(
           this, &manager_, frame_sink_id, std::move(display),
           std::move(begin_frame_source), std::move(request),
           std::move(private_request), std::move(client),
           std::move(display_private_request));
 }
 
 void DisplayCompositor::CreateCompositorFrameSink(
     const cc::FrameSinkId& frame_sink_id,
     cc::mojom::MojoCompositorFrameSinkRequest request,
     cc::mojom::MojoCompositorFrameSinkPrivateRequest private_request,
     cc::mojom::MojoCompositorFrameSinkClientPtr client) {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK_EQ(0u, compositor_frame_sinks_.count(frame_sink_id));
 
   compositor_frame_sinks_[frame_sink_id] =
-      base::MakeUnique<display_compositor::GpuCompositorFrameSink>(
+      base::MakeUnique<GpuCompositorFrameSink>(
           this, &manager_, frame_sink_id, std::move(request),
           std::move(private_request), std::move(client));
 }
 
 void DisplayCompositor::RegisterFrameSinkHierarchy(
     const cc::FrameSinkId& parent_frame_sink_id,
     const cc::FrameSinkId& child_frame_sink_id) {
   manager_.RegisterFrameSinkHierarchy(parent_frame_sink_id,
                                       child_frame_sink_id);
 }
@@ skipping 19 matching lines @@
           gpu_service_, surface_handle, gpu_memory_buffer_manager_.get(),
           image_factory_, gpu::SharedMemoryLimits(),
           nullptr /* shared_context */);
 
   // TODO(rjkroege): If there is something better to do than CHECK, add it.
   CHECK(context_provider->BindToCurrentThread());
 
   std::unique_ptr<cc::OutputSurface> display_output_surface;
   if (context_provider->ContextCapabilities().surfaceless) {
 #if defined(USE_OZONE)
-    display_output_surface = base::MakeUnique<DisplayOutputSurfaceOzone>(
-        std::move(context_provider), surface_handle,
-        begin_frame_source, gpu_memory_buffer_manager_.get(),
-        GL_TEXTURE_2D, GL_RGB);
+    display_output_surface = base::MakeUnique<ui::DisplayOutputSurfaceOzone>(
+        std::move(context_provider), surface_handle, begin_frame_source,
+        gpu_memory_buffer_manager_.get(), GL_TEXTURE_2D, GL_RGB);
 #else
     NOTREACHED();
 #endif
   } else {
-    display_output_surface = base::MakeUnique<DisplayOutputSurface>(
+    display_output_surface = base::MakeUnique<ui::DisplayOutputSurface>(
         std::move(context_provider), begin_frame_source);
   }
 
   int max_frames_pending =
       display_output_surface->capabilities().max_frames_pending;
   DCHECK_GT(max_frames_pending, 0);
 
   std::unique_ptr<cc::DisplayScheduler> scheduler(
       new cc::DisplayScheduler(task_runner_.get(), max_frames_pending));
 
@@ skipping 41 matching lines @@
 }
 
 void DisplayCompositor::OnPrivateConnectionLost(
     const cc::FrameSinkId& frame_sink_id,
     bool destroy_compositor_frame_sink) {
   DCHECK(thread_checker_.CalledOnValidThread());
   if (destroy_compositor_frame_sink)
     DestroyCompositorFrameSink(frame_sink_id);
 }
 
-}  // namespace ui
+}  // namespace frame_sinks