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

cc/test/test_web_graphics_context_3d.h

 // 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.
 
 #ifndef CC_TEST_TEST_WEB_GRAPHICS_CONTEXT_3D_H_
 #define CC_TEST_TEST_WEB_GRAPHICS_CONTEXT_3D_H_
 
 #include <vector>
 
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/containers/hash_tables.h"
 #include "base/containers/scoped_ptr_hash_map.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/stl_util.h"
 #include "base/synchronization/lock.h"
 #include "cc/output/context_provider.h"
 #include "cc/test/ordered_texture_map.h"
 #include "cc/test/test_texture.h"
+#include "gpu/command_buffer/common/sync_token.h"
 #include "third_party/khronos/GLES2/gl2.h"
 #include "ui/gfx/geometry/rect.h"
 
 extern "C" typedef struct _ClientBuffer* ClientBuffer;
 
 namespace cc {
 class TestContextSupport;
 
 class TestWebGraphicsContext3D {
  public:
@@ skipping 232 matching lines @@
                                                     GLenum internalformat,
                                                     GLenum usage);
 
   virtual void texImageIOSurface2DCHROMIUM(GLenum target,
                                            GLsizei width,
                                            GLsizei height,
                                            GLuint io_surface_id,
                                            GLuint plane) {}
 
   virtual unsigned insertSyncPoint();
-  virtual void waitSyncPoint(unsigned sync_point);
+  virtual void waitSyncPoint(unsigned sync_point, const GLbyte* sync_token);
 
   unsigned last_waited_sync_point() const { return last_waited_sync_point_; }
 
+  const gpu::SyncToken& last_waited_sync_token() const {

[dcheng, 2015/10/27 19:09:28]

Is this supposed to be called somewhere?

[David Yen, 2015/10/28 22:03:43]

I originally had them both live side by side until the next CL which would make
the swap, but piman@ recommended that I collapse the 2 so now it is being used
and last_waited_sync_point() has been deleted.

+    return last_waited_sync_token_;
+  }
+
   const ContextProvider::Capabilities& test_capabilities() const {
     return test_capabilities_;
   }
 
   void set_context_lost(bool context_lost) { context_lost_ = context_lost; }
   void set_times_bind_texture_succeeds(int times) {
     times_bind_texture_succeeds_ = times;
   }
   void set_times_end_query_succeeds(int times) {
     times_end_query_succeeds_ = times;
@@ skipping 179 matching lines @@
   int max_texture_size_;
   bool reshape_called_;
   int width_;
   int height_;
   float scale_factor_;
   TestContextSupport* test_support_;
   gfx::Rect update_rect_;
   UpdateType last_update_type_;
   unsigned next_insert_sync_point_;
   unsigned last_waited_sync_point_;
+  gpu::SyncToken last_waited_sync_token_;
   int unpack_alignment_;
 
   unsigned bound_buffer_;
   TextureTargets texture_targets_;
 
   scoped_refptr<Namespace> namespace_;
   static Namespace* shared_namespace_;
 
   base::WeakPtrFactory<TestWebGraphicsContext3D> weak_ptr_factory_;
 };
 
 }  // namespace cc
 
 #endif  // CC_TEST_TEST_WEB_GRAPHICS_CONTEXT_3D_H_