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

Unified Diff: cc/output/bsp_tree_unittest.cc

Issue 1441613002: cc: Remove ScopedPtrDeque. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/output/bsp_tree.cc ('k') | cc/output/direct_renderer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/output/bsp_tree_unittest.cc
diff --git a/cc/output/bsp_tree_unittest.cc b/cc/output/bsp_tree_unittest.cc
index 100bc919de478c8d47ee0521e98cfae197177e59..18e65a54425f35148a67d8fdf93e5ece2ec888e3 100644
--- a/cc/output/bsp_tree_unittest.cc
+++ b/cc/output/bsp_tree_unittest.cc
@@ -2,9 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <deque>
+
#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
-#include "cc/base/scoped_ptr_deque.h"
#include "cc/base/scoped_ptr_vector.h"
#include "cc/output/bsp_tree.h"
#include "cc/output/bsp_walk_action.h"
@@ -30,7 +31,7 @@ namespace {
class BspTreeTest {
public:
- static void RunTest(ScopedPtrDeque<DrawPolygon>* test_polygons,
+ static void RunTest(std::deque<scoped_ptr<DrawPolygon>>* test_polygons,
const std::vector<int>& compare_list) {
BspTree bsp_tree(test_polygons);
@@ -113,7 +114,7 @@ TEST(BspTreeTest, NoSplit) {
scoped_ptr<DrawPolygon> polygon_c(
CREATE_DRAW_POLYGON(vertices_c, gfx::Vector3dF(0.0f, 0.0f, 1.0f), 2));
- ScopedPtrDeque<DrawPolygon> polygon_list;
+ std::deque<scoped_ptr<DrawPolygon>> polygon_list;
polygon_list.push_back(polygon_a.Pass());
polygon_list.push_back(polygon_b.Pass());
polygon_list.push_back(polygon_c.Pass());
@@ -141,7 +142,7 @@ TEST(BspTreeTest, BasicSplit) {
scoped_ptr<DrawPolygon> polygon_b(
CREATE_DRAW_POLYGON(vertices_b, gfx::Vector3dF(-1.0f, 0.0f, 0.0f), 1));
- ScopedPtrDeque<DrawPolygon> polygon_list;
+ std::deque<scoped_ptr<DrawPolygon>> polygon_list;
polygon_list.push_back(polygon_a.Pass());
polygon_list.push_back(polygon_b.Pass());
@@ -170,7 +171,7 @@ TEST(BspTreeTest, QuadOffset) {
scoped_ptr<DrawPolygon> polygon_b(
CREATE_DRAW_POLYGON(vertices_b, gfx::Vector3dF(-1.0f, 0.0f, 0.0f), 1));
- ScopedPtrDeque<DrawPolygon> polygon_list;
+ std::deque<scoped_ptr<DrawPolygon>> polygon_list;
polygon_list.push_back(polygon_a.Pass());
polygon_list.push_back(polygon_b.Pass());
@@ -199,7 +200,7 @@ TEST(BspTreeTest, QuadOffsetSplit) {
scoped_ptr<DrawPolygon> polygon_b(
CREATE_DRAW_POLYGON(vertices_b, gfx::Vector3dF(-1.0f, 0.0f, 0.0f), 1));
- ScopedPtrDeque<DrawPolygon> polygon_list;
+ std::deque<scoped_ptr<DrawPolygon>> polygon_list;
polygon_list.push_back(polygon_b.Pass());
polygon_list.push_back(polygon_a.Pass());
@@ -235,7 +236,7 @@ TEST(BspTreeTest, ThreeWaySplit) {
scoped_ptr<DrawPolygon> polygon_c(
CREATE_DRAW_POLYGON(vertices_c, gfx::Vector3dF(0.0f, 1.0f, 0.0f), 2));
- ScopedPtrDeque<DrawPolygon> polygon_list;
+ std::deque<scoped_ptr<DrawPolygon>> polygon_list;
polygon_list.push_back(polygon_a.Pass());
polygon_list.push_back(polygon_b.Pass());
polygon_list.push_back(polygon_c.Pass());
@@ -276,7 +277,7 @@ TEST(BspTreeTest, Coplanar) {
scoped_ptr<DrawPolygon> polygon_f = polygon_c->CreateCopy();
{
- ScopedPtrDeque<DrawPolygon> polygon_list;
+ std::deque<scoped_ptr<DrawPolygon>> polygon_list;
polygon_list.push_back(polygon_a.Pass());
polygon_list.push_back(polygon_b.Pass());
polygon_list.push_back(polygon_c.Pass());
@@ -288,7 +289,7 @@ TEST(BspTreeTest, Coplanar) {
// Now check a different order and ensure we get that back as well
{
- ScopedPtrDeque<DrawPolygon> polygon_list;
+ std::deque<scoped_ptr<DrawPolygon>> polygon_list;
polygon_list.push_back(polygon_f.Pass());
polygon_list.push_back(polygon_d.Pass());
polygon_list.push_back(polygon_e.Pass());
@@ -333,7 +334,7 @@ TEST(BspTreeTest, CoplanarSplit) {
scoped_ptr<DrawPolygon> polygon_d(
CREATE_DRAW_POLYGON(vertices_d, gfx::Vector3dF(-1.0f, 0.0f, 0.0f), 3));
- ScopedPtrDeque<DrawPolygon> polygon_list;
+ std::deque<scoped_ptr<DrawPolygon>> polygon_list;
polygon_list.push_back(polygon_a.Pass());
polygon_list.push_back(polygon_b.Pass());
polygon_list.push_back(polygon_c.Pass());
« no previous file with comments | « cc/output/bsp_tree.cc ('k') | cc/output/direct_renderer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698