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

cc/test/layer_tree_pixel_test.cc

 // Copyright 2013 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.
 
 #include "cc/test/layer_tree_pixel_test.h"
 
 #include "base/command_line.h"
 #include "base/path_service.h"
 #include "cc/base/switches.h"
 #include "cc/layers/solid_color_layer.h"
@@ skipping 229 matching lines @@
 scoped_ptr<SkBitmap> LayerTreePixelTest::CopyTextureMailboxToBitmap(
     const gfx::Size& size,
     const TextureMailbox& texture_mailbox) {
   DCHECK(texture_mailbox.IsTexture());
   if (!texture_mailbox.IsTexture())
     return nullptr;
 
   scoped_ptr<gpu::GLInProcessContext> context = CreateTestInProcessContext();
   GLES2Interface* gl = context->GetImplementation();
 
-  if (texture_mailbox.sync_point())
-    gl->WaitSyncPointCHROMIUM(texture_mailbox.sync_point());
+  if (texture_mailbox.sync_point() || texture_mailbox.sync_token().HasData()) {
+    gl->WaitSyncPointCHROMIUM(texture_mailbox.sync_point(),
+                              texture_mailbox.sync_token().GetConstData());
+  }
 
   GLuint texture_id = 0;
   gl->GenTextures(1, &texture_id);
   gl->BindTexture(GL_TEXTURE_2D, texture_id);
   gl->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
   gl->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
   gl->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
   gl->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
   gl->ConsumeTextureCHROMIUM(texture_mailbox.target(), texture_mailbox.name());
   gl->BindTexture(GL_TEXTURE_2D, 0);
@@ skipping 37 matching lines @@
     }
   }
 
   return bitmap.Pass();
 }
 
 void LayerTreePixelTest::ReleaseTextureMailbox(
     scoped_ptr<gpu::GLInProcessContext> context,
     uint32 texture,
     uint32 sync_point,
+    const gpu::SyncToken& sync_token,
     bool lost_resource) {
   GLES2Interface* gl = context->GetImplementation();
-  if (sync_point)
-    gl->WaitSyncPointCHROMIUM(sync_point);
+  if (sync_point || sync_token.HasData())
+    gl->WaitSyncPointCHROMIUM(sync_point, sync_token.GetConstData());
   gl->DeleteTextures(1, &texture);
   pending_texture_mailbox_callbacks_--;
   TryEndTest();
 }
 
 void LayerTreePixelTest::CopyBitmapToTextureMailboxAsTexture(
     const SkBitmap& bitmap,
     TextureMailbox* texture_mailbox,
     scoped_ptr<SingleReleaseCallback>* release_callback) {
   DCHECK_GT(bitmap.width(), 0);
@@ skipping 43 matching lines @@
                    GL_UNSIGNED_BYTE,
                    gl_pixels.get());
   }
 
   gpu::Mailbox mailbox;
   gl->GenMailboxCHROMIUM(mailbox.name);
   gl->ProduceTextureCHROMIUM(GL_TEXTURE_2D, mailbox.name);
   gl->BindTexture(GL_TEXTURE_2D, 0);
   uint32 sync_point = gl->InsertSyncPointCHROMIUM();
 
-  *texture_mailbox = TextureMailbox(mailbox, GL_TEXTURE_2D, sync_point);
+  *texture_mailbox =
+      TextureMailbox(mailbox, GL_TEXTURE_2D, sync_point, gpu::SyncToken());
   *release_callback = SingleReleaseCallback::Create(
       base::Bind(&LayerTreePixelTest::ReleaseTextureMailbox,
                  base::Unretained(this),
                  base::Passed(&context),
                  texture_id));
 }
 
 void LayerTreePixelTest::Finish() {
   scoped_ptr<gpu::GLInProcessContext> context = CreateTestInProcessContext();
   GLES2Interface* gl = context->GetImplementation();
   gl->Finish();
 }
 
 }  // namespace cc