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..d1aa44ff052fb72c453ecd5f4921d04d151abb01 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; |
@@ -49,7 +48,6 @@ using mus::mojom::RenderPassId; |
using mus::mojom::RenderPassIdPtr; |
using mus::mojom::RenderPassQuadState; |
using mus::mojom::RenderPassQuadStatePtr; |
-using mus::mojom::ResourceFormat; |
using mus::mojom::ReturnedResource; |
using mus::mojom::ReturnedResourcePtr; |
using mus::mojom::SharedQuadState; |
@@ -540,8 +538,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 +548,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(); |
@@ -587,7 +582,7 @@ TypeConverter<TransferableResourcePtr, cc::TransferableResource>::Convert( |
const cc::TransferableResource& input) { |
TransferableResourcePtr transferable = TransferableResource::New(); |
transferable->id = input.id; |
- transferable->format = static_cast<ResourceFormat>(input.format); |
+ transferable->format = input.format; |
transferable->filter = input.filter; |
transferable->size = Size::From(input.size); |
transferable->mailbox_holder = MailboxHolder::From(input.mailbox_holder); |
@@ -603,7 +598,7 @@ TypeConverter<cc::TransferableResource, TransferableResourcePtr>::Convert( |
const TransferableResourcePtr& input) { |
cc::TransferableResource transferable; |
transferable.id = input->id; |
- transferable.format = static_cast<cc::ResourceFormat>(input->format); |
+ transferable.format = input->format; |
transferable.filter = input->filter; |
transferable.size = input->size.To<gfx::Size>(); |
transferable.mailbox_holder = input->mailbox_holder.To<gpu::MailboxHolder>(); |