| Index: cc/test/render_pass_test_utils.cc
|
| diff --git a/cc/test/render_pass_test_utils.cc b/cc/test/render_pass_test_utils.cc
|
| index b0464c2445ffcd83ddc9f7e8bc62f88120c0ddc2..186bfcaf725fdfbc84882e65c5f09931ea929980 100644
|
| --- a/cc/test/render_pass_test_utils.cc
|
| +++ b/cc/test/render_pass_test_utils.cc
|
| @@ -152,14 +152,15 @@ static void EmptyReleaseCallback(const gpu::SyncToken& sync_token,
|
| void AddOneOfEveryQuadType(RenderPass* to_pass,
|
| ResourceProvider* resource_provider,
|
| RenderPassId child_pass,
|
| - uint32_t* sync_point_for_mailbox_texture) {
|
| + gpu::SyncToken* sync_token_for_mailbox_tebxture) {
|
| gfx::Rect rect(0, 0, 100, 100);
|
| gfx::Rect opaque_rect(10, 10, 80, 80);
|
| gfx::Rect visible_rect(0, 0, 100, 100);
|
| const float vertex_opacity[] = {1.0f, 1.0f, 1.0f, 1.0f};
|
|
|
| - static const uint32_t kSyncTokenForMailboxTextureQuad = 30;
|
| - *sync_point_for_mailbox_texture = kSyncTokenForMailboxTextureQuad;
|
| + static const gpu::SyncToken kSyncTokenForMailboxTextureQuad(
|
| + gpu::CommandBufferNamespace::GPU_IO, 0, 0x123, 30);
|
| + *sync_token_for_mailbox_tebxture = kSyncTokenForMailboxTextureQuad;
|
|
|
| ResourceId resource1 = resource_provider->CreateResource(
|
| gfx::Size(45, 5), ResourceProvider::TEXTURE_HINT_IMMUTABLE,
|
| @@ -196,8 +197,7 @@ void AddOneOfEveryQuadType(RenderPass* to_pass,
|
| memcpy(gpu_mailbox.name, "Hello world", strlen("Hello world") + 1);
|
| scoped_ptr<SingleReleaseCallbackImpl> callback =
|
| SingleReleaseCallbackImpl::Create(base::Bind(&EmptyReleaseCallback));
|
| - TextureMailbox mailbox(
|
| - gpu_mailbox, gpu::SyncToken(*sync_point_for_mailbox_texture), target);
|
| + TextureMailbox mailbox(gpu_mailbox, kSyncTokenForMailboxTextureQuad, target);
|
| ResourceId resource8 = resource_provider->CreateResourceFromTextureMailbox(
|
| mailbox, std::move(callback));
|
| resource_provider->AllocateForTesting(resource8);
|
|
|