| Index: mojo/converters/surfaces/surfaces_type_converters.cc
|
| diff --git a/mojo/converters/surfaces/surfaces_type_converters.cc b/mojo/converters/surfaces/surfaces_type_converters.cc
|
| index bff1f7016b00ee31650e74a1f6018c1f4186e882..f012bbd0699d17b40f908a29c697aaf97f54dd59 100644
|
| --- a/mojo/converters/surfaces/surfaces_type_converters.cc
|
| +++ b/mojo/converters/surfaces/surfaces_type_converters.cc
|
| @@ -30,7 +30,6 @@
|
|
|
| using mus::mojom::Color;
|
| using mus::mojom::ColorPtr;
|
| -using mus::mojom::CommandBufferNamespace;
|
| using mus::mojom::CompositorFrame;
|
| using mus::mojom::CompositorFramePtr;
|
| using mus::mojom::CompositorFrameMetadata;
|
| @@ -540,8 +539,7 @@ SyncTokenPtr TypeConverter<SyncTokenPtr, gpu::SyncToken>::Convert(
|
| DCHECK(!input.HasData() || input.verified_flush());
|
| SyncTokenPtr sync_token(SyncToken::New());
|
| sync_token->verified_flush = input.verified_flush();
|
| - sync_token->namespace_id =
|
| - static_cast<CommandBufferNamespace>(input.namespace_id());
|
| + sync_token->namespace_id = input.namespace_id();
|
| sync_token->extra_data_field = input.extra_data_field();
|
| sync_token->command_buffer_id = input.command_buffer_id();
|
| sync_token->release_count = input.release_count();
|
| @@ -551,9 +549,7 @@ SyncTokenPtr TypeConverter<SyncTokenPtr, gpu::SyncToken>::Convert(
|
| // static
|
| gpu::SyncToken TypeConverter<gpu::SyncToken, SyncTokenPtr>::Convert(
|
| const SyncTokenPtr& input) {
|
| - const gpu::CommandBufferNamespace namespace_id =
|
| - static_cast<gpu::CommandBufferNamespace>(input->namespace_id);
|
| - gpu::SyncToken sync_token(namespace_id, input->extra_data_field,
|
| + gpu::SyncToken sync_token(input->namespace_id, input->extra_data_field,
|
| input->command_buffer_id, input->release_count);
|
| if (input->verified_flush)
|
| sync_token.SetVerifyFlush();
|
|
|