Add Satisfy() and Require() to MojoCompositorFrameSink

Sometimes Wayland client requires a surface before it is created by
SubmitCompositorFrame() since the request and creation use different message
pipes. This CL moves the implementation of Require and Satisfy to
CompositorFrameSink so that they share one message pipe with
SubmitCompositorFrame and things would happen in the correct order.

This is a temporary fix. kylechar@'s change of surface reference (CL 2541683004)
would formally address this issue.

BUG=659601
CQ_INCLUDE_TRYBOTS=master.tryserver.blink:linux_trusty_blink_rel

Review-Url: https://codereview.chromium.org/2551083003
Cr-Commit-Position: refs/heads/master@{#436806}

cc/ipc/mojo_compositor_frame_sink.mojom

@@ -10,6 +10,7 @@ import "cc/ipc/frame_sink_id.mojom";
 import "cc/ipc/local_frame_id.mojom";
 import "cc/ipc/surface_reference.mojom";
 import "cc/ipc/returned_resource.mojom";
+import "cc/ipc/surface_sequence.mojom";
 
 // A MojoCompositorFrameSink is an interface for receiving CompositorFrame
 // structs. A CompositorFrame contains the complete output meant for display.
@@ -42,6 +43,16 @@ interface MojoCompositorFrameSink {
   // that its resources gets returned in time.
   EvictFrame();
 
+  // TODO(staraz): Delete Require() and Satisfy() once surface references
+  // (CL 2541683004) are ready.
+  // Add the provided |sequence| as a destruction dependency of the
+  // surface associated with the provided |local_frame_id|.
+  Require(cc.mojom.LocalFrameId local_frame_id,
+          cc.mojom.SurfaceSequence sequence);
+
+  // Mark the sequence as satisfied and garbage collect surfaces.
+  Satisfy(cc.mojom.SurfaceSequence sequence);
+
   // TODO(fsamuel): ReadbackBitmap API would be useful here.
 };
 

cc/surfaces/compositor_frame_sink_support.cc

@@ -8,6 +8,7 @@
 #include "cc/scheduler/begin_frame_source.h"
 #include "cc/surfaces/compositor_frame_sink_support_client.h"
 #include "cc/surfaces/display.h"
+#include "cc/surfaces/surface.h"
 #include "cc/surfaces/surface_manager.h"
 
 namespace cc {
@@ -83,6 +84,22 @@ void CompositorFrameSinkSupport::SubmitCompositorFrame(
   }
 }
 
+void CompositorFrameSinkSupport::Require(const LocalFrameId& local_frame_id,
+                                         const SurfaceSequence& sequence) {
+  Surface* surface = surface_manager_->GetSurfaceForId(
+      SurfaceId(frame_sink_id_, local_frame_id));
+  if (!surface) {
+    DLOG(ERROR) << "Attempting to require callback on nonexistent surface";
+    return;
+  }
+  surface->AddDestructionDependency(sequence);
+}
+
+void CompositorFrameSinkSupport::Satisfy(const SurfaceSequence& sequence) {
+  std::vector<uint32_t> sequences = {sequence.sequence};
+  surface_manager_->DidSatisfySequences(sequence.frame_sink_id, &sequences);
+}
+
 void CompositorFrameSinkSupport::DidReceiveCompositorFrameAck() {
   DCHECK_GT(ack_pending_count_, 0);
   ack_pending_count_--;

cc/surfaces/compositor_frame_sink_support.h

@@ -39,6 +39,9 @@ class CC_SURFACES_EXPORT CompositorFrameSinkSupport
   void SetNeedsBeginFrame(bool needs_begin_frame);
   void SubmitCompositorFrame(const LocalFrameId& local_frame_id,
                              CompositorFrame frame);
+  void Require(const LocalFrameId& local_frame_id,
+               const SurfaceSequence& sequence);
+  void Satisfy(const SurfaceSequence& sequence);
   void AddChildFrameSink(const FrameSinkId& child_frame_sink_id);
   void RemoveChildFrameSink(const FrameSinkId& child_frame_sink_id);
 

content/browser/renderer_host/offscreen_canvas_compositor_frame_sink.cc

@@ -74,6 +74,19 @@ void OffscreenCanvasCompositorFrameSink::EvictFrame() {
   NOTIMPLEMENTED();
 }
 
+void OffscreenCanvasCompositorFrameSink::Require(
+    const cc::LocalFrameId& local_frame_id,
+    const cc::SurfaceSequence& sequence) {
+  // TODO(staraz): Implement this.
+  NOTIMPLEMENTED();
+}
+
+void OffscreenCanvasCompositorFrameSink::Satisfy(
+    const cc::SurfaceSequence& sequence) {
+  // TODO(staraz): Implement this.
+  NOTIMPLEMENTED();
+}
+
 void OffscreenCanvasCompositorFrameSink::ReturnResources(
     const cc::ReturnedResourceArray& resources) {
   if (resources.empty())

content/browser/renderer_host/offscreen_canvas_compositor_frame_sink.h

@@ -36,6 +36,9 @@ class OffscreenCanvasCompositorFrameSink
   void RemoveSurfaceReferences(
       const std::vector<cc::SurfaceReference>& references) override;
   void EvictFrame() override;
+  void Require(const cc::LocalFrameId& local_frame_id,
+               const cc::SurfaceSequence& sequence) override;
+  void Satisfy(const cc::SurfaceSequence& sequence) override;
 
   // cc::SurfaceFactoryClient implementation.
   void ReturnResources(const cc::ReturnedResourceArray& resources) override;

services/ui/surfaces/gpu_compositor_frame_sink.cc

@@ -57,6 +57,15 @@ void GpuCompositorFrameSink::RemoveSurfaceReferences(
   display_compositor_->RemoveSurfaceReferences(references);
 }
 
+void GpuCompositorFrameSink::Require(const cc::LocalFrameId& local_frame_id,
+                                     const cc::SurfaceSequence& sequence) {
+  support_.Require(local_frame_id, sequence);
+}
+
+void GpuCompositorFrameSink::Satisfy(const cc::SurfaceSequence& sequence) {
+  support_.Satisfy(sequence);
+}
+
 void GpuCompositorFrameSink::DidReceiveCompositorFrameAck() {
   if (client_)
     client_->DidReceiveCompositorFrameAck();

services/ui/surfaces/gpu_compositor_frame_sink.h

@@ -48,6 +48,9 @@ class GpuCompositorFrameSink
       const std::vector<cc::SurfaceReference>& references) override;
   void RemoveSurfaceReferences(
       const std::vector<cc::SurfaceReference>& references) override;
+  void Require(const cc::LocalFrameId& local_frame_id,
+               const cc::SurfaceSequence& sequence) override;
+  void Satisfy(const cc::SurfaceSequence& sequence) override;
 
   // cc::mojom::MojoCompositorFrameSinkPrivate:
   void AddChildFrameSink(const cc::FrameSinkId& child_frame_sink_id) override;