| Index: cc/surfaces/surface_id_allocator.cc
|
| diff --git a/cc/surfaces/surface_id_allocator.cc b/cc/surfaces/surface_id_allocator.cc
|
| index d71467562e1ca21fbae3ac651fe2aaf1f847177d..ce3c882b13ef15965b07a1691b8c04842cd09b28 100644
|
| --- a/cc/surfaces/surface_id_allocator.cc
|
| +++ b/cc/surfaces/surface_id_allocator.cc
|
| @@ -26,14 +26,14 @@ SurfaceIdAllocator::~SurfaceIdAllocator() {
|
| }
|
|
|
| SurfaceId SurfaceIdAllocator::GenerateId() {
|
| - SurfaceId id(static_cast<uint64_t>(id_namespace_) << 32 | next_id_);
|
| + SurfaceId id(id_namespace_, next_id_);
|
| next_id_++;
|
| return id;
|
| }
|
|
|
| // static
|
| uint32_t SurfaceIdAllocator::NamespaceForId(SurfaceId id) {
|
| - return id.id >> 32;
|
| + return id.id_namespace;
|
| }
|
|
|
| } // namespace cc
|
|
|