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/trees/layer_tree_host_common.h" | 5 #include "cc/trees/layer_tree_host_common.h" |
6 | 6 |
7 #include <sstream> | 7 #include <sstream> |
8 | 8 |
9 #include "base/files/file_path.h" | 9 #include "base/files/file_path.h" |
10 #include "base/files/file_util.h" | 10 #include "base/files/file_util.h" |
(...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
235 host_impl); | 235 host_impl); |
236 | 236 |
237 LayerImplList base_list; | 237 LayerImplList base_list; |
238 BuildLayerImplList(active_tree->root_layer(), &base_list); | 238 BuildLayerImplList(active_tree->root_layer(), &base_list); |
239 | 239 |
240 int polygon_counter = 0; | 240 int polygon_counter = 0; |
241 ScopedPtrVector<DrawPolygon> polygon_list; | 241 ScopedPtrVector<DrawPolygon> polygon_list; |
242 for (LayerImplList::iterator it = base_list.begin(); it != base_list.end(); | 242 for (LayerImplList::iterator it = base_list.begin(); it != base_list.end(); |
243 ++it) { | 243 ++it) { |
244 DrawPolygon* draw_polygon = | 244 DrawPolygon* draw_polygon = |
245 new DrawPolygon(NULL, | 245 new DrawPolygon(nullptr, |
246 gfx::RectF((*it)->content_bounds()), | 246 gfx::RectF((*it)->content_bounds()), |
247 (*it)->draw_transform(), | 247 (*it)->draw_transform(), |
248 polygon_counter++); | 248 polygon_counter++); |
249 polygon_list.push_back(scoped_ptr<DrawPolygon>(draw_polygon)); | 249 polygon_list.push_back(scoped_ptr<DrawPolygon>(draw_polygon)); |
250 } | 250 } |
251 | 251 |
252 timer_.Reset(); | 252 timer_.Reset(); |
253 do { | 253 do { |
254 ScopedPtrDeque<DrawPolygon> test_list; | 254 ScopedPtrDeque<DrawPolygon> test_list; |
255 for (int i = 0; i < num_duplicates_; i++) { | 255 for (int i = 0; i < num_duplicates_; i++) { |
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
351 | 351 |
352 TEST_F(BspTreePerfTest, BspTreeCubes_4) { | 352 TEST_F(BspTreePerfTest, BspTreeCubes_4) { |
353 SetTestName("bsp_tree_cubes_4"); | 353 SetTestName("bsp_tree_cubes_4"); |
354 SetNumberOfDuplicates(4); | 354 SetNumberOfDuplicates(4); |
355 ReadTestFile("layer_sort_cubes"); | 355 ReadTestFile("layer_sort_cubes"); |
356 RunSortLayers(); | 356 RunSortLayers(); |
357 } | 357 } |
358 | 358 |
359 } // namespace | 359 } // namespace |
360 } // namespace cc | 360 } // namespace cc |
OLD | NEW |