cc: Reject CompositorFrames to old child surfaces

cc/surfaces/surface.cc

 // Copyright 2014 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 "cc/surfaces/surface.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
 
 #include "base/stl_util.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/copy_output_request.h"
 #include "cc/surfaces/local_surface_id_allocator.h"
 #include "cc/surfaces/pending_frame_observer.h"
 #include "cc/surfaces/surface_factory.h"
+#include "cc/surfaces/surface_factory_client.h"
 #include "cc/surfaces/surface_manager.h"
+#include "cc/surfaces/surface_resource_holder_client.h"
 
 namespace cc {
 
 // The frame index starts at 2 so that empty frames will be treated as
 // completely damaged the first time they're drawn from.
 static const int kFrameIndexStart = 2;
 
 Surface::Surface(const SurfaceId& id, base::WeakPtr<SurfaceFactory> factory)
     : surface_id_(id),
       previous_frame_surface_id_(id),
@@ skipping 14 matching lines @@
 void Surface::SetPreviousFrameSurface(Surface* surface) {
   DCHECK(surface && (HasActiveFrame() || HasPendingFrame()));
   frame_index_ = surface->frame_index() + 1;
   previous_frame_surface_id_ = surface->surface_id();
   CompositorFrame& frame = active_frame_data_ ? active_frame_data_->frame
                                               : pending_frame_data_->frame;
   surface->TakeLatencyInfo(&frame.metadata.latency_info);
   surface->TakeLatencyInfoFromPendingFrame(&frame.metadata.latency_info);
 }
 
+void Surface::Close() {
+  closed_ = true;
+}
+
 void Surface::QueueFrame(CompositorFrame frame,
                          const DrawCallback& callback,
                          const WillDrawCallback& will_draw_callback) {
+  if (closed_) {
+    if (factory_ && factory_->resource_holder_client()) {
+      ReturnedResourceArray resources;
+      TransferableResource::ReturnResources(frame.resource_list, &resources);
+      factory_->resource_holder_client()->ReturnResources(resources);
+    }
+    callback.Run();
+    return;
+  }
+
   TakeLatencyInfoFromPendingFrame(&frame.metadata.latency_info);
 
   base::Optional<FrameData> previous_pending_frame_data =
       std::move(pending_frame_data_);
   pending_frame_data_.reset();
 
   UpdateBlockingSurfaces(previous_pending_frame_data.has_value(), frame);
 
   // Receive and track the resources referenced from the CompositorFrame
   // regardless of whether it's pending or active.
   factory_->ReceiveFromChild(frame.resource_list);
 
   bool is_pending_frame = !blocking_surfaces_.empty();
 
   if (is_pending_frame) {
+    // Reject CompositorFrames to surfaces referenced from CompositorFrame while

[danakj, 2017/05/04 21:39:13]

CompositorFrame is a type, you're using it in this sentence like it's an object,
and I can't tell if there is two of them or what. I suggest giving the things ur
talking about in here names and refer to them that way, like algebra.

[Fady Samuel, 2017/05/04 22:44:04]

I'm not sure what you mean. I do agree this is confusing, because the comment is
a bit stale. I've updated the comment. Hopefully it's clearer now.

+    // it is blocked. This saves some CPU cycles to allow children to catch up
+    // to this surface's client.
+    base::flat_set<FrameSinkId> embedded_frame_sink_ids;
+    for (const SurfaceId& surface_id : frame.metadata.embedded_surfaces)
+      embedded_frame_sink_ids.insert(surface_id.frame_sink_id());
+    for (const SurfaceId& surface_id : frame.metadata.referenced_surfaces) {
+      // If this surface is a fallback surface, then we close the fallback to
+      // accepting new frames.
+      bool is_fallback_surface =
+          embedded_frame_sink_ids.count(surface_id.frame_sink_id()) > 0;

[danakj, 2017/05/04 21:39:13]

Didnt ur other CL just make it not possible to be in both lists?

[Fady Samuel, 2017/05/04 22:44:04]

I'm comparing FrameSinkIds not SurfaceIds.

Basically, the primary and fallback SurfaceInfo should have the same
FrameSinkId. If we find a surface ID with a FrameSinkId from
referenced_surfaces, then we know the referenced_surfaces SurfaceId is a
fallback.

+      if (is_fallback_surface) {
+        Surface* surface = factory_->manager()->GetSurfaceForId(surface_id);
+        DCHECK(surface);
+        surface->Close();
+      }
+    }
     pending_frame_data_ =
         FrameData(std::move(frame), callback, will_draw_callback);
     // Ask the surface manager to inform |this| when its dependencies are
     // resolved.
     factory_->manager()->RequestSurfaceResolution(this);
   } else {
     // If there are no blockers, then immediately activate the frame.
     ActivateFrame(FrameData(std::move(frame), callback, will_draw_callback));
   }
 
@@ skipping 265 matching lines @@
     frame->metadata.latency_info.swap(*latency_info);
     return;
   }
   std::copy(frame->metadata.latency_info.begin(),
             frame->metadata.latency_info.end(),
             std::back_inserter(*latency_info));
   frame->metadata.latency_info.clear();
 }
 
 }  // namespace cc