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

Unified Diff: cc/quads/list_container_unittest.cc

Issue 683113005: Update from chromium https://crrev.com/302282 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 2 months 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/quads/list_container.cc ('k') | cc/quads/render_pass.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/quads/list_container_unittest.cc
diff --git a/cc/quads/list_container_unittest.cc b/cc/quads/list_container_unittest.cc
index 31a479be3c6d0a31d314c1d69fce1dc03a3c307f..d68ab59ca0fa4d5b97fe3d5ebd9ded533fc90bf0 100644
--- a/cc/quads/list_container_unittest.cc
+++ b/cc/quads/list_container_unittest.cc
@@ -230,7 +230,7 @@ TEST(ListContainerTest,
sqs_list.begin();
sqs_iter != sqs_list.end();
++sqs_iter) {
- EXPECT_EQ(*sqs_iter, &*iter);
+ EXPECT_EQ(*sqs_iter, *iter);
++iter;
}
}
@@ -315,7 +315,7 @@ TEST(ListContainerTest,
sqs_list.begin();
sqs_iter != sqs_list.end();
++sqs_iter) {
- EXPECT_EQ(*sqs_iter, &*iter);
+ EXPECT_EQ(*sqs_iter, *iter);
++iter;
}
}
@@ -335,7 +335,7 @@ TEST(ListContainerTest, SimpleIterationSharedQuadState) {
for (ListContainer<SharedQuadState>::Iterator iter = list.begin();
iter != list.end();
++iter) {
- EXPECT_EQ(*sqs_iter, &*iter);
+ EXPECT_EQ(*sqs_iter, *iter);
++num_iters_in_list;
++sqs_iter;
}
@@ -348,7 +348,7 @@ TEST(ListContainerTest, SimpleIterationSharedQuadState) {
sqs_list.begin();
sqs_iter != sqs_list.end();
++sqs_iter) {
- EXPECT_EQ(*sqs_iter, &*iter);
+ EXPECT_EQ(*sqs_iter, *iter);
++num_iters_in_vector;
++iter;
}
@@ -372,8 +372,8 @@ TEST(ListContainerTest, SimpleConstIteratorIterationSharedQuadState) {
for (ListContainer<SharedQuadState>::ConstIterator iter = list.begin();
iter != list.end();
++iter) {
- EXPECT_TRUE(isConstSharedQuadStatePointer(&*iter));
- EXPECT_EQ(*sqs_iter, &*iter);
+ EXPECT_TRUE(isConstSharedQuadStatePointer(*iter));
+ EXPECT_EQ(*sqs_iter, *iter);
++sqs_iter;
}
}
@@ -384,8 +384,8 @@ TEST(ListContainerTest, SimpleConstIteratorIterationSharedQuadState) {
for (ListContainer<SharedQuadState>::Iterator iter = list.begin();
iter != list.end();
++iter) {
- EXPECT_FALSE(isConstSharedQuadStatePointer(&*iter));
- EXPECT_EQ(*sqs_iter, &*iter);
+ EXPECT_FALSE(isConstSharedQuadStatePointer(*iter));
+ EXPECT_EQ(*sqs_iter, *iter);
++sqs_iter;
}
}
@@ -396,7 +396,7 @@ TEST(ListContainerTest, SimpleConstIteratorIterationSharedQuadState) {
sqs_list.begin();
sqs_iter != sqs_list.end();
++sqs_iter) {
- EXPECT_EQ(*sqs_iter, &*iter);
+ EXPECT_EQ(*sqs_iter, *iter);
++iter;
}
}
@@ -417,7 +417,7 @@ TEST(ListContainerTest, SimpleReverseInsertionSharedQuadState) {
for (ListContainer<SharedQuadState>::ReverseIterator iter = list.rbegin();
iter != list.rend();
++iter) {
- EXPECT_EQ(*sqs_iter, &(*iter));
+ EXPECT_EQ(*sqs_iter, *iter);
++sqs_iter;
}
}
@@ -428,7 +428,7 @@ TEST(ListContainerTest, SimpleReverseInsertionSharedQuadState) {
sqs_list.rbegin();
sqs_iter != sqs_list.rend();
++sqs_iter) {
- EXPECT_EQ(*sqs_iter, &(*iter));
+ EXPECT_EQ(*sqs_iter, *iter);
++iter;
}
}
@@ -451,7 +451,7 @@ TEST(ListContainerTest, SimpleDeletion) {
for (ListContainer<DrawQuad>::Iterator iter = list.begin();
iter != list.end();
++iter) {
- EXPECT_EQ(i, static_cast<SimpleDrawQuad*>(&*iter)->get_value());
+ EXPECT_EQ(i, static_cast<SimpleDrawQuad*>(*iter)->get_value());
++i;
}
}
@@ -468,7 +468,7 @@ TEST(ListContainerTest, SimpleIterationAndManipulation) {
ListContainer<DrawQuad>::Iterator iter = list.begin();
for (int i = 0; i < 10; ++i) {
- static_cast<SimpleDrawQuad*>(&*iter)->set_value(i);
+ static_cast<SimpleDrawQuad*>(*iter)->set_value(i);
++iter;
}
« no previous file with comments | « cc/quads/list_container.cc ('k') | cc/quads/render_pass.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698