| 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 <deque> | 5 #include <deque> |
| 6 | 6 |
| 7 #include "base/macros.h" | 7 #include "base/macros.h" |
| 8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
| 9 #include "cc/base/scoped_ptr_vector.h" | |
| 10 #include "cc/output/bsp_tree.h" | 9 #include "cc/output/bsp_tree.h" |
| 11 #include "cc/output/bsp_walk_action.h" | 10 #include "cc/output/bsp_walk_action.h" |
| 12 #include "cc/quads/draw_polygon.h" | 11 #include "cc/quads/draw_polygon.h" |
| 13 #include "testing/gtest/include/gtest/gtest.h" | 12 #include "testing/gtest/include/gtest/gtest.h" |
| 14 | 13 |
| 15 namespace cc { | 14 namespace cc { |
| 16 namespace { | 15 namespace { |
| 17 | 16 |
| 18 #define EXPECT_SORTED_LISTS_EQ(polygon_list, compare_list) \ | 17 #define EXPECT_SORTED_LISTS_EQ(polygon_list, compare_list) \ |
| 19 do { \ | 18 do { \ |
| (...skipping 320 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 340 polygon_list.push_back(polygon_c.Pass()); | 339 polygon_list.push_back(polygon_c.Pass()); |
| 341 polygon_list.push_back(polygon_d.Pass()); | 340 polygon_list.push_back(polygon_d.Pass()); |
| 342 | 341 |
| 343 int compare_ids[] = {3, 0, 1, 2, 3}; | 342 int compare_ids[] = {3, 0, 1, 2, 3}; |
| 344 std::vector<int> compare_list = INT_VECTOR_FROM_ARRAY(compare_ids); | 343 std::vector<int> compare_list = INT_VECTOR_FROM_ARRAY(compare_ids); |
| 345 BspTreeTest::RunTest(&polygon_list, compare_list); | 344 BspTreeTest::RunTest(&polygon_list, compare_list); |
| 346 } | 345 } |
| 347 | 346 |
| 348 } // namespace | 347 } // namespace |
| 349 } // namespace cc | 348 } // namespace cc |
| OLD | NEW |