Update from chromium a8e7c94b1b79a0948d05a1fcfff53391d22ce37a

gpu/command_buffer/service/mailbox_manager.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 GPU_COMMAND_BUFFER_SERVICE_MAILBOX_MANAGER_H_
 #define GPU_COMMAND_BUFFER_SERVICE_MAILBOX_MANAGER_H_
 
 #include <functional>
 #include <map>
 
@@ skipping 23 matching lines @@
   // Put the texture into the named mailbox.
   void ProduceTexture(unsigned target,
                       const Mailbox& mailbox,
                       Texture* texture);
 
   // Returns whether this manager synchronizes with other instances.
   bool UsesSync() { return sync_ != NULL; }
 
   // Used with the MailboxSynchronizer to push/pull texture state to/from
   // other manager instances.
-  void PushTextureUpdates();
-  void PullTextureUpdates();
+  void PushTextureUpdates(uint32 sync_point);
+  void PullTextureUpdates(uint32 sync_point);
 
   // Destroy any mailbox that reference the given texture.
   void TextureDeleted(Texture* texture);
 
  private:
   friend class base::RefCounted<MailboxManager>;
   friend class MailboxSynchronizer;
 
   ~MailboxManager();
 
@@ skipping 22 matching lines @@
 
   MailboxSynchronizer* sync_;
 
   DISALLOW_COPY_AND_ASSIGN(MailboxManager);
 };
 }  // namespage gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_MAILBOX_MANAGER_H_