Add/remove surface references via MojoCompositorFrameSink.

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 21 matching lines @@
     cc::mojom::DisplayCompositorClientPtr client)
     : manager_(cc::SurfaceManager::LifetimeType::REFERENCES),
       reference_manager_(&manager_),
       gpu_service_(std::move(gpu_service)),
       gpu_memory_buffer_manager_(std::move(gpu_memory_buffer_manager)),
       image_factory_(image_factory),
       task_runner_(base::ThreadTaskRunnerHandle::Get()),
       client_(std::move(client)),
       binding_(this, std::move(request)) {
   manager_.AddObserver(this);
+  if (client_)
+    client_->OnDisplayCompositorCreated(GetRootSurfaceId());
+}
+
+void DisplayCompositor::AddSurfaceReferences(
+    const std::vector<cc::SurfaceReference>& references) {
+  DCHECK(thread_checker_.CalledOnValidThread());
+  for (auto& reference : references)
+    AddSurfaceReference(reference);
+}
+
+void DisplayCompositor::RemoveSurfaceReferences(
+    const std::vector<cc::SurfaceReference>& references) {
+  DCHECK(thread_checker_.CalledOnValidThread());
+
+  // TODO(kylechar): Each remove reference can trigger GC, it would be better if
+  // we GC only once if removing multiple references.
+  for (auto& reference : references)
+    RemoveSurfaceReference(reference);
+}
+
+DisplayCompositor::~DisplayCompositor() {
+  DCHECK(thread_checker_.CalledOnValidThread());
+  // Remove all temporary references on shutdown.
+  for (auto& map_entry : temp_references_) {
+    const cc::FrameSinkId& frame_sink_id = map_entry.first;
+    for (auto& local_frame_id : map_entry.second) {
+      reference_manager_->RemoveSurfaceReference(
+          GetRootSurfaceId(), cc::SurfaceId(frame_sink_id, local_frame_id));
+    }
+  }
+  manager_.RemoveObserver(this);
+}
+
+void DisplayCompositor::OnCompositorFrameSinkClientConnectionLost(
+    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);
+  // TODO(fsamuel): Tell the display compositor host that the client connection
+  // has been lost so that it can drop its private connection and allow a new
+  // client instance to create a new CompositorFrameSink.
+}
+
+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(
     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());
   // We cannot create more than one CompositorFrameSink with a given
   // |frame_sink_id|.
   DCHECK_EQ(0u, compositor_frame_sinks_.count(frame_sink_id));
 
   std::unique_ptr<cc::Display> display;
   if (surface_handle != gpu::kNullSurfaceHandle)
     display = CreateDisplay(frame_sink_id, surface_handle);
 
   compositor_frame_sinks_[frame_sink_id] =
       base::MakeUnique<GpuCompositorFrameSink>(
           this, frame_sink_id, std::move(display), std::move(request),
           std::move(private_request), std::move(client));
 }
 
-void DisplayCompositor::AddRootSurfaceReference(const cc::SurfaceId& child_id) {
-  DCHECK(thread_checker_.CalledOnValidThread());
-  AddSurfaceReference(GetRootSurfaceId(), child_id);
-}
+void DisplayCompositor::AddSurfaceReference(const cc::SurfaceReference& ref) {
+  const cc::SurfaceId& parent_id = ref.parent_id();
+  const cc::SurfaceId& child_id = ref.child_id();
 
-void DisplayCompositor::AddSurfaceReference(const cc::SurfaceId& parent_id,
-                                            const cc::SurfaceId& child_id) {
-  DCHECK(thread_checker_.CalledOnValidThread());
   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.
   if (vector_iter == temp_references_.end()) {
     reference_manager_->AddSurfaceReference(parent_id, child_id);
     return;
   }
 
   // Get the vector<LocalFrameId> for the appropriate FrameSinkId and look for
@@ skipping 28 matching lines @@
   // Remove markers for temporary references up to |child_id|, as the temporary
   // references they correspond to were removed above. If |ref_iter| is the last
   // element in |refs| then we are removing all temporary references for the
   // FrameSinkId and can remove the map entry entirely.
   if (++temp_ref_iter == refs.end())
     temp_references_.erase(child_id.frame_sink_id());
   else
     refs.erase(refs.begin(), ++temp_ref_iter);
 }
 
-void DisplayCompositor::RemoveRootSurfaceReference(
-    const cc::SurfaceId& child_id) {
-  DCHECK(thread_checker_.CalledOnValidThread());
-  RemoveSurfaceReference(GetRootSurfaceId(), child_id);
-}
-
-void DisplayCompositor::RemoveSurfaceReference(const cc::SurfaceId& parent_id,
-                                               const cc::SurfaceId& child_id) {
-  DCHECK(thread_checker_.CalledOnValidThread());
-  // TODO(kylechar): Each remove reference can trigger GC, it would be better if
-  // we GC only once if removing multiple references.
-  reference_manager_->RemoveSurfaceReference(parent_id, child_id);
-}
-
-DisplayCompositor::~DisplayCompositor() {
-  DCHECK(thread_checker_.CalledOnValidThread());
-  // Remove all temporary references on shutdown.
-  for (auto& map_entry : temp_references_) {
-    const cc::FrameSinkId& frame_sink_id = map_entry.first;
-    for (auto& local_frame_id : map_entry.second) {
-      reference_manager_->RemoveSurfaceReference(
-          GetRootSurfaceId(), cc::SurfaceId(frame_sink_id, local_frame_id));
-    }
-  }
-  manager_.RemoveObserver(this);
-}
-
-void DisplayCompositor::OnCompositorFrameSinkClientConnectionLost(
-    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);
-  // TODO(fsamuel): Tell the display compositor host that the client connection
-  // has been lost so that it can drop its private connection and allow a new
-  // client instance to create a new CompositorFrameSink.
-}
-
-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::RemoveSurfaceReference(
+    const cc::SurfaceReference& ref) {
+  reference_manager_->RemoveSurfaceReference(ref.parent_id(), ref.child_id());
 }
 
 std::unique_ptr<cc::Display> DisplayCompositor::CreateDisplay(
     const cc::FrameSinkId& frame_sink_id,
     gpu::SurfaceHandle surface_handle) {
   scoped_refptr<cc::InProcessContextProvider> context_provider =
       new cc::InProcessContextProvider(
           gpu_service_, surface_handle, gpu_memory_buffer_manager_.get(),
           image_factory_, gpu::SharedMemoryLimits(),
           nullptr /* shared_context */);
@@ skipping 55 matching lines @@
       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