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 684bdd95646ebb2cd13007266d829e3dfde92f05..f2bae0c0272937a5a9962704bebdd7591c9359fb 100644 |
--- a/mojo/converters/surfaces/surfaces_type_converters.cc |
+++ b/mojo/converters/surfaces/surfaces_type_converters.cc |
@@ -256,18 +256,15 @@ bool ConvertDrawQuad(const QuadPtr& input, |
SurfaceIdPtr TypeConverter<SurfaceIdPtr, cc::SurfaceId>::Convert( |
const cc::SurfaceId& input) { |
SurfaceIdPtr id(SurfaceId::New()); |
- id->local = static_cast<uint32_t>(input.id); |
- id->id_namespace = cc::SurfaceIdAllocator::NamespaceForId(input); |
+ id->local = input.local_id; |
+ id->id_namespace = input.id_namespace; |
return id; |
} |
// static |
cc::SurfaceId TypeConverter<cc::SurfaceId, SurfaceIdPtr>::Convert( |
const SurfaceIdPtr& input) { |
- uint64_t packed_id = input->id_namespace; |
- packed_id <<= 32ull; |
- packed_id |= input->local; |
- return cc::SurfaceId(packed_id); |
+ return cc::SurfaceId(input->id_namespace, input->local); |
} |
// static |