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

cc/test/test_web_graphics_context_3d.h

Index: cc/test/test_web_graphics_context_3d.h
diff --git a/cc/test/test_web_graphics_context_3d.h b/cc/test/test_web_graphics_context_3d.h
index 9aabf0d4433a43137f173289cb21e160b39ee45a..5bc1fa51be87d6ff039158f71dd19502b3c4ccbc 100644
--- a/cc/test/test_web_graphics_context_3d.h
+++ b/cc/test/test_web_graphics_context_3d.h
@@ -19,6 +19,7 @@
 #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"
 
@@ -271,10 +272,14 @@ class TestWebGraphicsContext3D {
                                            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_;
   }
@@ -474,6 +479,7 @@ class TestWebGraphicsContext3D {
   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_;