Split cc::mojom::DisplayCompositor::CreateCompositorFrameSink() into CreateDisplayCompositorFrameSi…

services/ui/surfaces/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 <utility>
 
 #include "cc/output/in_process_context_provider.h"
 #include "cc/output/texture_mailbox_deleter.h"
@@ skipping 74 matching lines @@
 }
 
 void DisplayCompositor::OnCompositorFrameSinkPrivateConnectionLost(
     const cc::FrameSinkId& frame_sink_id,
     bool destroy_compositor_frame_sink) {
   DCHECK(thread_checker_.CalledOnValidThread());
   if (destroy_compositor_frame_sink)
     compositor_frame_sinks_.erase(frame_sink_id);
 }
 
-void DisplayCompositor::CreateCompositorFrameSink(
+void DisplayCompositor::CreateDisplayCompositorFrameSink(
     const cc::FrameSinkId& frame_sink_id,
     gpu::SurfaceHandle surface_handle,
     cc::mojom::MojoCompositorFrameSinkRequest request,
     cc::mojom::MojoCompositorFrameSinkPrivateRequest private_request,
     cc::mojom::MojoCompositorFrameSinkClientPtr client) {
-  DCHECK(thread_checker_.CalledOnValidThread());

[Fady Samuel, 2016/12/14 17:19:01]

I would leave this here too because we're doing work prior to going to
CreateCompositorFrameSinkInternal.

[Alex Z., 2016/12/14 18:44:12]

Done.

-  // We cannot create more than one CompositorFrameSink with a given
-  // |frame_sink_id|.
-  DCHECK_EQ(0u, compositor_frame_sinks_.count(frame_sink_id));
+  DCHECK_NE(surface_handle, gpu::kNullSurfaceHandle);
+  std::unique_ptr<cc::SyntheticBeginFrameSource> begin_frame_source(
+      new cc::DelayBasedBeginFrameSource(
+          base::MakeUnique<cc::DelayBasedTimeSource>(task_runner_.get())));
+  CreateCompositorFrameSinkInternal(
+      frame_sink_id, surface_handle,
+      CreateDisplay(frame_sink_id, surface_handle, begin_frame_source.get()),
+      std::move(begin_frame_source), std::move(request),
+      std::move(private_request), std::move(client));
+}
 
-  std::unique_ptr<cc::Display> display;
-  std::unique_ptr<cc::SyntheticBeginFrameSource> begin_frame_source;
-  if (surface_handle != gpu::kNullSurfaceHandle) {
-    begin_frame_source.reset(new cc::DelayBasedBeginFrameSource(
-        base::MakeUnique<cc::DelayBasedTimeSource>(task_runner_.get())));
-    display =
-        CreateDisplay(frame_sink_id, surface_handle, begin_frame_source.get());
-  }
-
-  compositor_frame_sinks_[frame_sink_id] =
-      base::MakeUnique<GpuCompositorFrameSink>(
-          this, frame_sink_id, std::move(display),
-          std::move(begin_frame_source), std::move(request),
-          std::move(private_request), std::move(client));
+void DisplayCompositor::CreateOffscreenCompositorFrameSink(
+    const cc::FrameSinkId& frame_sink_id,
+    cc::mojom::MojoCompositorFrameSinkRequest request,
+    cc::mojom::MojoCompositorFrameSinkPrivateRequest private_request,
+    cc::mojom::MojoCompositorFrameSinkClientPtr client) {
+  CreateCompositorFrameSinkInternal(
+      frame_sink_id, gpu::kNullSurfaceHandle, nullptr, nullptr,
+      std::move(request), std::move(private_request), std::move(client));
 }
 
 void DisplayCompositor::AddSurfaceReference(const cc::SurfaceReference& ref) {
   const cc::SurfaceId& parent_id = ref.parent_id();
   const cc::SurfaceId& child_id = ref.child_id();
 
   auto vector_iter = temp_references_.find(child_id.frame_sink_id());
 
   // If there are no temporary references for the FrameSinkId then we can just
   // add reference and return.
@@ skipping 81 matching lines @@
   std::unique_ptr<cc::DisplayScheduler> scheduler(
       new cc::DisplayScheduler(task_runner_.get(), max_frames_pending));
 
   return base::MakeUnique<cc::Display>(
       nullptr /* bitmap_manager */, gpu_memory_buffer_manager_.get(),
       cc::RendererSettings(), frame_sink_id, begin_frame_source,
       std::move(display_output_surface), std::move(scheduler),
       base::MakeUnique<cc::TextureMailboxDeleter>(task_runner_.get()));
 }
 
+void DisplayCompositor::CreateCompositorFrameSinkInternal(
+    const cc::FrameSinkId& frame_sink_id,
+    gpu::SurfaceHandle surface_handle,
+    std::unique_ptr<cc::Display> display,
+    std::unique_ptr<cc::SyntheticBeginFrameSource> begin_frame_source,
+    cc::mojom::MojoCompositorFrameSinkRequest request,
+    cc::mojom::MojoCompositorFrameSinkPrivateRequest private_request,
+    cc::mojom::MojoCompositorFrameSinkClientPtr client) {
+  DCHECK(thread_checker_.CalledOnValidThread());
+  // We cannot create more than one CompositorFrameSink with a given
+  // |frame_sink_id|.
+  DCHECK_EQ(0u, compositor_frame_sinks_.count(frame_sink_id));
+
+  compositor_frame_sinks_[frame_sink_id] =
+      base::MakeUnique<GpuCompositorFrameSink>(
+          this, frame_sink_id, std::move(display),
+          std::move(begin_frame_source), std::move(request),
+          std::move(private_request), std::move(client));
+}
+
 const cc::SurfaceId& DisplayCompositor::GetRootSurfaceId() const {
   return reference_manager_->GetRootSurfaceId();
 }
 
 void DisplayCompositor::OnSurfaceCreated(const cc::SurfaceId& surface_id,
                                          const gfx::Size& frame_size,
                                          float device_scale_factor) {
   DCHECK(thread_checker_.CalledOnValidThread());
   // We can get into a situation where multiple CompositorFrames arrive for a
   // CompositorFrameSink before the DisplayCompositorClient can add any
   // references for the frame. When the second frame with a new size arrives,
   // the first will be destroyed and then if there are no references it will be
   // deleted during surface GC. A temporary reference, removed when a real
   // reference is received, is added to prevent this from happening.
   reference_manager_->AddSurfaceReference(GetRootSurfaceId(), surface_id);
   temp_references_[surface_id.frame_sink_id()].push_back(
       surface_id.local_frame_id());
 
   if (client_)
     client_->OnSurfaceCreated(surface_id, frame_size, device_scale_factor);
 }
 
 void DisplayCompositor::OnSurfaceDamaged(const cc::SurfaceId& surface_id,
                                          bool* changed) {}
 
 }  // namespace ui