| Index: cc/trees/layer_tree_host_perftest.cc
|
| diff --git a/cc/trees/layer_tree_host_perftest.cc b/cc/trees/layer_tree_host_perftest.cc
|
| index 053f52a131237e7df0aac5accb0d03d23c94fde1..ef4e3eb637dd0d487d790b0856f0244ec63420fa 100644
|
| --- a/cc/trees/layer_tree_host_perftest.cc
|
| +++ b/cc/trees/layer_tree_host_perftest.cc
|
| @@ -260,7 +260,8 @@ TEST_F(ScrollingLayerTreePerfTest, LongScrollablePageThreaded) {
|
| set_verify_property_trees(old_verify_property_trees);
|
| }
|
|
|
| -static void EmptyReleaseCallback(uint32 sync_point, bool lost_resource) {}
|
| +static void EmptyReleaseCallback(const gpu::SyncToken& sync_token,
|
| + bool lost_resource) {}
|
|
|
| // Simulates main-thread scrolling on each frame.
|
| class BrowserCompositorInvalidateLayerTreePerfTest
|
| @@ -292,7 +293,8 @@ class BrowserCompositorInvalidateLayerTreePerfTest
|
| reinterpret_cast<const int8*>(name_stream.str().c_str()));
|
| scoped_ptr<SingleReleaseCallback> callback = SingleReleaseCallback::Create(
|
| base::Bind(&EmptyReleaseCallback));
|
| - TextureMailbox mailbox(gpu_mailbox, GL_TEXTURE_2D, next_sync_point_);
|
| + TextureMailbox mailbox(gpu_mailbox, gpu::SyncToken(next_sync_point_),
|
| + GL_TEXTURE_2D);
|
| next_sync_point_++;
|
|
|
| tab_contents_->SetTextureMailbox(mailbox, callback.Pass());
|
|
|