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

cc/layers/texture_layer.h

 // Copyright 2010 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 CC_LAYERS_TEXTURE_LAYER_H_
 #define CC_LAYERS_TEXTURE_LAYER_H_
 
 #include <string>
 
 #include "base/callback.h"
 #include "base/synchronization/lock.h"
 #include "base/threading/thread_checker.h"
 #include "cc/base/cc_export.h"
 #include "cc/layers/layer.h"
 #include "cc/resources/texture_mailbox.h"
 
+namespace gpu {
+struct SyncToken;
+}
+
 namespace cc {
 class BlockingTaskRunner;
 class SingleReleaseCallback;
 class SingleReleaseCallbackImpl;
 class TextureLayerClient;
 
 // A Layer containing a the rendered output of a plugin instance.
 class CC_EXPORT TextureLayer : public Layer {
  public:
   class CC_EXPORT TextureMailboxHolder
       : public base::RefCountedThreadSafe<TextureMailboxHolder> {
    public:
     class CC_EXPORT MainThreadReference {
      public:
       explicit MainThreadReference(TextureMailboxHolder* holder);
       ~MainThreadReference();
       TextureMailboxHolder* holder() { return holder_.get(); }
 
      private:
       scoped_refptr<TextureMailboxHolder> holder_;
       DISALLOW_COPY_AND_ASSIGN(MainThreadReference);
     };
 
     const TextureMailbox& mailbox() const { return mailbox_; }
-    void Return(uint32 sync_point, bool is_lost);
+    void Return(uint32 sync_point,
+                const gpu::SyncToken& sync_token,
+                bool is_lost);
 
     // Gets a ReleaseCallback that can be called from another thread. Note: the
     // caller must ensure the callback is called.
     scoped_ptr<SingleReleaseCallbackImpl> GetCallbackForImplThread();
 
    protected:
     friend class TextureLayer;
 
     // Protected visiblity so only TextureLayer and unit tests can create these.
     static scoped_ptr<MainThreadReference> Create(
         const TextureMailbox& mailbox,
         scoped_ptr<SingleReleaseCallback> release_callback);
     virtual ~TextureMailboxHolder();
 
    private:
     friend class base::RefCountedThreadSafe<TextureMailboxHolder>;
     friend class MainThreadReference;
     explicit TextureMailboxHolder(
         const TextureMailbox& mailbox,
         scoped_ptr<SingleReleaseCallback> release_callback);
 
     void InternalAddRef();
     void InternalRelease();
     void ReturnAndReleaseOnImplThread(
         uint32 sync_point,
+        const gpu::SyncToken& sync_token,
         bool is_lost,
         BlockingTaskRunner* main_thread_task_runner);
 
     // These members are only accessed on the main thread, or on the impl thread
     // during commit where the main thread is blocked.
     unsigned internal_references_;
     TextureMailbox mailbox_;
     scoped_ptr<SingleReleaseCallback> release_callback_;
 
     // This lock guards the sync_point_ and is_lost_ fields because they can be
     // accessed on both the impl and main thread. We do this to ensure that the
     // values of these fields are well-ordered such that the last call to
     // ReturnAndReleaseOnImplThread() defines their values.
     base::Lock arguments_lock_;
     uint32 sync_point_;
+    gpu::SyncToken sync_token_;
     bool is_lost_;
     base::ThreadChecker main_thread_checker_;
     DISALLOW_COPY_AND_ASSIGN(TextureMailboxHolder);
   };
 
   // Used when mailbox names are specified instead of texture IDs.
   static scoped_refptr<TextureLayer> CreateForMailbox(
       const LayerSettings& settings,
       TextureLayerClient* client);
 
@@ skipping 72 matching lines @@
   bool blend_background_color_;
 
   scoped_ptr<TextureMailboxHolder::MainThreadReference> holder_ref_;
   bool needs_set_mailbox_;
 
   DISALLOW_COPY_AND_ASSIGN(TextureLayer);
 };
 
 }  // namespace cc
 #endif  // CC_LAYERS_TEXTURE_LAYER_H_