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

cc/layers/texture_layer.h

Index: cc/layers/texture_layer.h
diff --git a/cc/layers/texture_layer.h b/cc/layers/texture_layer.h
index 0c0b2ec237d948b2be265aa66298a70f4fe5884a..b9bce50121af36b1752f99907176818a12b0f2ec 100644
--- a/cc/layers/texture_layer.h
+++ b/cc/layers/texture_layer.h
@@ -14,6 +14,10 @@
 #include "cc/layers/layer.h"
 #include "cc/resources/texture_mailbox.h"
 
+namespace gpu {
+struct SyncToken;
+}
+
 namespace cc {
 class BlockingTaskRunner;
 class SingleReleaseCallback;
@@ -38,7 +42,9 @@ class CC_EXPORT TextureLayer : public Layer {
     };
 
     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.
@@ -64,6 +70,7 @@ class CC_EXPORT TextureLayer : public Layer {
     void InternalRelease();
     void ReturnAndReleaseOnImplThread(
         uint32 sync_point,
+        const gpu::SyncToken& sync_token,
         bool is_lost,
         BlockingTaskRunner* main_thread_task_runner);
 
@@ -79,6 +86,7 @@ class CC_EXPORT TextureLayer : public Layer {
     // 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);