| OLD | NEW |
|---|
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/test/ordered_texture_map.h" | 5 #include "cc/test/ordered_texture_map.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <algorithm> |
| 10 |
| 9 #include "base/logging.h" | 11 #include "base/logging.h" |
| 10 #include "cc/test/test_texture.h" | 12 #include "cc/test/test_texture.h" |
| 11 | 13 |
| 12 namespace cc { | 14 namespace cc { |
| 13 | 15 |
| 14 OrderedTextureMap::OrderedTextureMap() {} | 16 OrderedTextureMap::OrderedTextureMap() {} |
| 15 | 17 |
| 16 OrderedTextureMap::~OrderedTextureMap() {} | 18 OrderedTextureMap::~OrderedTextureMap() {} |
| 17 | 19 |
| 18 void OrderedTextureMap::Append(GLuint id, | 20 void OrderedTextureMap::Append(GLuint id, |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 58 DCHECK(texture.get()); | 60 DCHECK(texture.get()); |
| 59 return texture; | 61 return texture; |
| 60 } | 62 } |
| 61 | 63 |
| 62 GLuint OrderedTextureMap::IdAt(size_t index) { | 64 GLuint OrderedTextureMap::IdAt(size_t index) { |
| 63 DCHECK(index < Size()); | 65 DCHECK(index < Size()); |
| 64 return ordered_textures_[index]; | 66 return ordered_textures_[index]; |
| 65 } | 67 } |
| 66 | 68 |
| 67 } // namespace cc | 69 } // namespace cc |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2273193002:
Make compositor_frame.h NOT include base/trace_event/trace_event.h (Closed)
