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

content/renderer/gpu/mailbox_output_surface.h

 // Copyright (c) 2012 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.
 
 #ifndef CONTENT_RENDERER_GPU_MAILBOX_OUTPUT_SURFACE_H_
 #define CONTENT_RENDERER_GPU_MAILBOX_OUTPUT_SURFACE_H_
 
 #include <queue>
 
 #include "base/memory/ref_counted.h"
@@ skipping 34 matching lines @@
   void SwapBuffers(cc::CompositorFrame* frame) override;
 
  private:
   // CompositorOutputSurface overrides.
   void OnSwapAck(uint32 output_surface_id,
                  const cc::CompositorFrameAck& ack) override;
 
   size_t GetNumAcksPending();
 
   struct TransferableFrame {
-    TransferableFrame() : texture_id(0), sync_point(0) {}
-
+    TransferableFrame();
     TransferableFrame(uint32 texture_id,
                       const gpu::Mailbox& mailbox,
-                      const gfx::Size size)
-        : texture_id(texture_id), mailbox(mailbox), size(size), sync_point(0) {}
+                      const gfx::Size size);
 
     uint32 texture_id;
     gpu::Mailbox mailbox;
+    gpu::SyncToken sync_token;
     gfx::Size size;
     uint32 sync_point;
   };
 
   TransferableFrame current_backing_;
   std::deque<TransferableFrame> pending_textures_;
   std::queue<TransferableFrame> returned_textures_;
 
   uint32 fbo_;
   bool is_backbuffer_discarded_;
   cc::ResourceFormat format_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_GPU_MAILBOX_OUTPUT_SURFACE_H_