Index: cc/resources/resource_provider_unittest.cc |
diff --git a/cc/resources/resource_provider_unittest.cc b/cc/resources/resource_provider_unittest.cc |
index a54e1254bd77f74b405bac68d7f531f714452485..e97173445fc159760559318a77ee16363c72c1aa 100644 |
--- a/cc/resources/resource_provider_unittest.cc |
+++ b/cc/resources/resource_provider_unittest.cc |
@@ -121,7 +121,8 @@ class TextureStateTrackingContext : public TestWebGraphicsContext3D { |
void genSyncToken(GLuint64 fence_sync, GLbyte* sync_token) override { |
gpu::SyncToken sync_token_data(gpu::CommandBufferNamespace::GPU_IO, 0, |
- 0x123, fence_sync); |
+ gpu::CommandBufferId::FromUnsafeValue(0x123), |
+ fence_sync); |
sync_token_data.SetVerifyFlush(); |
memcpy(sync_token, &sync_token_data, sizeof(sync_token_data)); |
} |
@@ -199,7 +200,8 @@ class ResourceProviderContext : public TestWebGraphicsContext3D { |
void genSyncToken(GLuint64 fence_sync, GLbyte* sync_token) override { |
gpu::SyncToken sync_token_data(gpu::CommandBufferNamespace::GPU_IO, 0, |
- 0x123, fence_sync); |
+ gpu::CommandBufferId::FromUnsafeValue(0x123), |
+ fence_sync); |
sync_token_data.SetVerifyFlush(); |
// Commit the produceTextureCHROMIUM calls at this point, so that |
// they're associated with the sync point. |
@@ -2835,7 +2837,8 @@ class ResourceProviderTestTextureMailboxGLFilters |
use_image_texture_targets_)); |
unsigned texture_id = 1; |
- gpu::SyncToken sync_token(gpu::CommandBufferNamespace::GPU_IO, 0, 0x12, |
+ gpu::SyncToken sync_token(gpu::CommandBufferNamespace::GPU_IO, 0, |
+ gpu::CommandBufferId::FromUnsafeValue(0x12), |
0x34); |
unsigned target = GL_TEXTURE_2D; |
const GLuint64 current_fence_sync = context->GetNextFenceSync(); |
@@ -2978,7 +2981,8 @@ TEST_P(ResourceProviderTest, TextureMailbox_GLTextureExternalOES) { |
gpu_memory_buffer_manager_.get(), NULL, 0, 1, |
use_gpu_memory_buffer_resources_, use_image_texture_targets_)); |
- gpu::SyncToken sync_token(gpu::CommandBufferNamespace::GPU_IO, 0, 0x12, 0x34); |
+ gpu::SyncToken sync_token(gpu::CommandBufferNamespace::GPU_IO, 0, |
+ gpu::CommandBufferId::FromUnsafeValue(0x12), 0x34); |
const GLuint64 current_fence_sync = context->GetNextFenceSync(); |
unsigned target = GL_TEXTURE_EXTERNAL_OES; |
@@ -3047,7 +3051,8 @@ TEST_P(ResourceProviderTest, |
gpu_memory_buffer_manager_.get(), NULL, 0, 1, |
use_gpu_memory_buffer_resources_, use_image_texture_targets_)); |
- gpu::SyncToken sync_token(gpu::CommandBufferNamespace::GPU_IO, 0, 0x12, 0x34); |
+ gpu::SyncToken sync_token(gpu::CommandBufferNamespace::GPU_IO, 0, |
+ gpu::CommandBufferId::FromUnsafeValue(0x12), 0x34); |
const GLuint64 current_fence_sync = context->GetNextFenceSync(); |
unsigned target = GL_TEXTURE_2D; |