Modified old wait sync point functions to also accept new sync tokens.

components/mus/public/interfaces/compositor_frame.mojom

 // 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.
 
 module mus.mojom;
 
 import "ui/mojo/geometry/geometry.mojom";
 import "components/mus/public/interfaces/quads.mojom";
 
 enum ResourceFormat {
   RGBA_8888,
   RGBA_4444,
   BGRA_8888,
   ALPHA_8,
   LUMINANCE_8,
   RGB_565,
   ETC1,
 };
 
+// See src/gpu/command_buffer/common/constants.h
+enum CommandBufferNamespace {
+  INVALID = -1,
+
+  GPU_IO,
+  IN_PROCESS,
+  MOJO,
+  OLD_SYNC_POINTS,
+
+  NUM_COMMAND_BUFFER_NAMESPACES
+};
+
+// See src/gpu/command_buffer/common/sync_token.h
+struct SyncToken {
+  bool verified_flush;
+  CommandBufferNamespace namespace_id;
+  uint64 command_buffer_id;
+  uint64 release_count;
+};
+
 // See src/cc/resources/returned_resource.h.
 struct ReturnedResource {
   uint32 id;
-  uint32 sync_point;
+  SyncToken sync_token;
   int32 count;
   bool lost;
 };
 
 // See src/gpu/command_buffer/common/mailbox.h.
 struct Mailbox {
   array<int8, 64> name;
 };
 
 // See src/gpu/command_buffer/common/mailbox_holder.h.
 struct MailboxHolder {
   Mailbox mailbox;
+  SyncToken sync_token;
   uint32 texture_target;
-  uint32 sync_point;
 };
 
 // A TransferableResource is a graphics resource such as a texture or a bitmap
 // in shared memory (software mode) that is shared between the window server and
 // a client. This data structure is used to manage reuse of
 // the memory once it is no longer needed by the window server and GPU service.
 struct TransferableResource {
   // |id| is an integer that uniquely identifies this resource  in the client so
   // that the window server can return this resource back to the client.
   uint32 id;
@@ skipping 23 matching lines @@
 interface Surface {
   // After the submitted frame is drawn for the first time, the receiver will
   // respond to the SubmitFrame message. Clients should use this acknowledgement
   // to ratelimit frame submissions.
   SubmitCompositorFrame(CompositorFrame frame) => ();
 };
 
 interface SurfaceClient {
   ReturnResources(array<ReturnedResource> resources);
 };