Moving temporary reference logic to SurfaceManager

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 "base/memory/ptr_util.h"
 #include "base/threading/thread_task_runner_handle.h"
@@ skipping 30 matching lines @@
       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)

[danakj, 2017/01/17 21:56:42]

{}

[Saman Sami, 2017/01/18 18:03:36]

Done.

-    AddSurfaceReference(reference);
+    reference_manager_->AddSurfaceReference(reference.parent_id(),
+                                            reference.child_id());
 }
 
 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)

[danakj, 2017/01/17 21:56:42]

{}

[Saman Sami, 2017/01/18 18:03:36]

Done.

-    RemoveSurfaceReference(reference);
+    reference_manager_->RemoveSurfaceReference(reference.parent_id(),
+                                               reference.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
@@ skipping 34 matching lines @@
     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), nullptr);
 }
 
-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.
-  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
-  // |child_id.local_frame_id| in that vector. If found, there is a temporary
-  // reference to |child_id|.
-  std::vector<cc::LocalFrameId>& refs = vector_iter->second;
-  auto temp_ref_iter =
-      std::find(refs.begin(), refs.end(), child_id.local_frame_id());
-
-  if (temp_ref_iter == refs.end()) {
-    reference_manager_->AddSurfaceReference(parent_id, child_id);
-    return;
-  }
-
-  // All surfaces get a temporary reference to the top level root. If the parent
-  // wants to add a reference to the top level root then we do nothing.
-  // Otherwise remove the temporary reference and add the reference.
-  if (parent_id != GetRootSurfaceId()) {
-    reference_manager_->AddSurfaceReference(parent_id, child_id);
-    reference_manager_->RemoveSurfaceReference(GetRootSurfaceId(), child_id);
-  }
-
-  // Remove temporary references for surfaces with the same FrameSinkId that
-  // were created before |child_id|. The earlier surfaces were never embedded in
-  // the parent and the parent is embedding a later surface, so we know the
-  // parent doesn't need them anymore.
-  for (auto iter = refs.begin(); iter != temp_ref_iter; ++iter) {
-    cc::SurfaceId id = cc::SurfaceId(child_id.frame_sink_id(), *iter);
-    reference_manager_->RemoveSurfaceReference(GetRootSurfaceId(), id);
-  }
-
-  // Remove markers for temporary references up to |child_id|, as the temporary
-  // references they correspond to were removed above. If |temp_ref_iter| points
-  // at 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::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,
     cc::SyntheticBeginFrameSource* begin_frame_source) {
   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 51 matching lines @@
           std::move(display_request));
 }
 
 const cc::SurfaceId& DisplayCompositor::GetRootSurfaceId() const {
   return reference_manager_->GetRootSurfaceId();
 }
 
 void DisplayCompositor::OnSurfaceCreated(const cc::SurfaceInfo& surface_info) {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK_GT(surface_info.device_scale_factor(), 0.0f);
-  // 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_info.id());
-  temp_references_[surface_info.id().frame_sink_id()].push_back(
-      surface_info.id().local_frame_id());
 
   if (client_)
     client_->OnSurfaceCreated(surface_info);
 }
 
 void DisplayCompositor::OnSurfaceDamaged(const cc::SurfaceId& surface_id,
                                          bool* changed) {}
 
 }  // namespace ui