Chromium Code Reviews| 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 #ifndef CC_SURFACES_SURFACE_FACTORY_H_ | 5 #ifndef CC_SURFACES_SURFACE_FACTORY_H_ |
| 6 #define CC_SURFACES_SURFACE_FACTORY_H_ | 6 #define CC_SURFACES_SURFACE_FACTORY_H_ |
| 7 | 7 |
| 8 #include <set> | 8 #include <set> |
| 9 | 9 |
| 10 #include "base/callback_forward.h" | 10 #include "base/callback_forward.h" |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 69 bool needs_sync_points() const { return needs_sync_points_; } | 69 bool needs_sync_points() const { return needs_sync_points_; } |
| 70 void set_needs_sync_points(bool needs) { needs_sync_points_ = needs; } | 70 void set_needs_sync_points(bool needs) { needs_sync_points_ = needs; } |
| 71 | 71 |
| 72 private: | 72 private: |
| 73 SurfaceManager* manager_; | 73 SurfaceManager* manager_; |
| 74 SurfaceFactoryClient* client_; | 74 SurfaceFactoryClient* client_; |
| 75 SurfaceResourceHolder holder_; | 75 SurfaceResourceHolder holder_; |
| 76 | 76 |
| 77 bool needs_sync_points_; | 77 bool needs_sync_points_; |
| 78 | 78 |
| 79 typedef base::ScopedPtrHashMap<SurfaceId, Surface> OwningSurfaceMap; | 79 typedef base::ScopedPtrHashMap<SurfaceId, scoped_ptr<Surface>> |
| 80 base::ScopedPtrHashMap<SurfaceId, Surface> surface_map_; | 80 OwningSurfaceMap; |
| 81 base::ScopedPtrHashMap<SurfaceId, scoped_ptr<Surface>> surface_map_; | |
|
danakj
2015/04/24 17:15:10
nit: would you mind changing this to OwningSurface
kcwu
2015/04/27 13:28:03
Done.
| |
| 81 | 82 |
| 82 DISALLOW_COPY_AND_ASSIGN(SurfaceFactory); | 83 DISALLOW_COPY_AND_ASSIGN(SurfaceFactory); |
| 83 }; | 84 }; |
| 84 | 85 |
| 85 } // namespace cc | 86 } // namespace cc |
| 86 | 87 |
| 87 #endif // CC_SURFACES_SURFACE_FACTORY_H_ | 88 #endif // CC_SURFACES_SURFACE_FACTORY_H_ |
| OLD | NEW |