| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "cc/surfaces/surface_id_allocator.h" | 5 #include "cc/surfaces/surface_id_allocator.h" |
| 6 | 6 |
| 7 #include <stdint.h> | 7 #include <stdint.h> |
| 8 | 8 |
| 9 #include "base/rand_util.h" | 9 #include "base/rand_util.h" |
| 10 #include "base/unguessable_token.h" | 10 #include "base/unguessable_token.h" |
| 11 | 11 |
| 12 namespace cc { | 12 namespace cc { |
| 13 | 13 |
| 14 SurfaceIdAllocator::SurfaceIdAllocator() : next_id_(1u) {} | 14 SurfaceIdAllocator::SurfaceIdAllocator() : next_id_(1u) {} |
| 15 | 15 |
| 16 SurfaceIdAllocator::~SurfaceIdAllocator() { | 16 SurfaceIdAllocator::~SurfaceIdAllocator() { |
| 17 } | 17 } |
| 18 | 18 |
| 19 LocalFrameId SurfaceIdAllocator::GenerateId() { | 19 const LocalFrameId& SurfaceIdAllocator::GenerateId() { |
| 20 LocalFrameId id(next_id_, base::UnguessableToken::Create()); | 20 current_local_frame_id_ = |
| 21 LocalFrameId(next_id_, base::UnguessableToken::Create()); |
| 21 next_id_++; | 22 next_id_++; |
| 22 return id; | 23 return current_local_frame_id_; |
| 23 } | 24 } |
| 24 | 25 |
| 25 } // namespace cc | 26 } // namespace cc |
| OLD | NEW |