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

cc/test/test_web_graphics_context_3d.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/test_web_graphics_context_3d.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/bind.h"
@@ skipping 49 matching lines @@
       next_framebuffer_id_(1),
       current_framebuffer_(0),
       max_texture_size_(2048),
       reshape_called_(false),
       width_(0),
       height_(0),
       scale_factor_(-1.f),
       test_support_(NULL),
       last_update_type_(NO_UPDATE),
       next_insert_sync_point_(1),
-      last_waited_sync_point_(0),
       unpack_alignment_(4),
       bound_buffer_(0),
       weak_ptr_factory_(this) {
   CreateNamespace();
   set_support_image(true);
 }
 
 TestWebGraphicsContext3D::~TestWebGraphicsContext3D() {
   base::AutoLock lock(g_shared_namespace_lock.Get());
   namespace_ = NULL;
@@ skipping 563 matching lines @@
   base::AutoLock lock(namespace_->lock);
   base::hash_set<unsigned>& images = namespace_->images;
   images.insert(image_id);
   return image_id;
 }
 
 unsigned TestWebGraphicsContext3D::insertSyncPoint() {
   return next_insert_sync_point_++;
 }
 
-void TestWebGraphicsContext3D::waitSyncPoint(unsigned sync_point) {
-  if (sync_point)
-    last_waited_sync_point_ = sync_point;
+void TestWebGraphicsContext3D::waitSyncToken(const GLbyte* sync_token) {
+  if (sync_token) {
+    gpu::SyncToken sync_token_data;
+    memcpy(sync_token_data.GetData(), sync_token, sizeof(sync_token_data));
+    if (sync_token_data.HasData())
+      last_waited_sync_token_ = sync_token_data;
+  }
 }
 
 size_t TestWebGraphicsContext3D::NumTextures() const {
   base::AutoLock lock(namespace_->lock);
   return namespace_->textures.Size();
 }
 
 GLuint TestWebGraphicsContext3D::TextureAt(int i) const {
   base::AutoLock lock(namespace_->lock);
   return namespace_->textures.IdAt(i);
@@ skipping 149 matching lines @@
 
 TestWebGraphicsContext3D::Buffer::Buffer() : target(0), size(0) {}
 
 TestWebGraphicsContext3D::Buffer::~Buffer() {}
 
 TestWebGraphicsContext3D::Image::Image() {}
 
 TestWebGraphicsContext3D::Image::~Image() {}
 
 }  // namespace cc