Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(846)

Side by Side Diff: cc/surfaces/surface_manager.cc

Issue 331533002: Use a struct for cc::Surface ids for more type safety (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add is_null and explicit ctor Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « cc/surfaces/surface_manager.h ('k') | cc/surfaces/surface_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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_manager.h" 5 #include "cc/surfaces/surface_manager.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 8
9 namespace cc { 9 namespace cc {
10 10
11 SurfaceManager::SurfaceManager() 11 SurfaceManager::SurfaceManager()
12 : next_surface_id_(1) { 12 : next_surface_id_(1) {
13 } 13 }
14 14
15 SurfaceManager::~SurfaceManager() {} 15 SurfaceManager::~SurfaceManager() {}
16 16
17 int SurfaceManager::RegisterAndAllocateIDForSurface(Surface* surface) { 17 SurfaceId SurfaceManager::RegisterAndAllocateIdForSurface(Surface* surface) {
18 DCHECK(surface); 18 DCHECK(surface);
19 int surface_id = next_surface_id_++; 19 int surface_id = next_surface_id_++;
20 surface_map_[surface_id] = surface; 20 surface_map_[surface_id] = surface;
21 return surface_id; 21 return SurfaceId(surface_id);
22 } 22 }
23 23
24 void SurfaceManager::DeregisterSurface(int surface_id) { 24 void SurfaceManager::DeregisterSurface(SurfaceId surface_id) {
25 SurfaceMap::iterator it = surface_map_.find(surface_id); 25 SurfaceMap::iterator it = surface_map_.find(surface_id.id);
26 DCHECK(it != surface_map_.end()); 26 DCHECK(it != surface_map_.end());
27 surface_map_.erase(it); 27 surface_map_.erase(it);
28 } 28 }
29 29
30 Surface* SurfaceManager::GetSurfaceForID(int surface_id) { 30 Surface* SurfaceManager::GetSurfaceForId(SurfaceId surface_id) {
31 SurfaceMap::iterator it = surface_map_.find(surface_id); 31 SurfaceMap::iterator it = surface_map_.find(surface_id.id);
32 if (it == surface_map_.end()) 32 if (it == surface_map_.end())
33 return NULL; 33 return NULL;
34 return it->second; 34 return it->second;
35 } 35 }
36 36
37 } // namespace cc 37 } // namespace cc
OLDNEW
« no previous file with comments | « cc/surfaces/surface_manager.h ('k') | cc/surfaces/surface_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698