summaryrefslogtreecommitdiffstats
path: root/mojo
diff options
context:
space:
mode:
authorweiliangc <weiliangc@chromium.org>2014-10-29 13:30:12 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-29 20:30:47 +0000
commit48805fce83d8bd3d28a2dc84477b50d483fc46b0 (patch)
treeaaeb4915f80f61bdabf96e239f870e2ff1ae9db6 /mojo
parente60561ddb24168c6682466b91567b6f9d54cae94 (diff)
downloadchromium_src-48805fce83d8bd3d28a2dc84477b50d483fc46b0.zip
chromium_src-48805fce83d8bd3d28a2dc84477b50d483fc46b0.tar.gz
chromium_src-48805fce83d8bd3d28a2dc84477b50d483fc46b0.tar.bz2
Make ListContainer Consistently Act as Container of Pointers
Usage of ListContainer is replacing scoped_ptr_vector. SharedQuadState is stored in DrawQuad as pointer form. ListContainer should act as container of pointers. This CL changes the return value from dereference iterator from reference to pointers. BUG=344962 Review URL: https://codereview.chromium.org/629343002 Cr-Commit-Position: refs/heads/master@{#301916}
Diffstat (limited to 'mojo')
-rw-r--r--mojo/converters/surfaces/surfaces_type_converters.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/mojo/converters/surfaces/surfaces_type_converters.cc b/mojo/converters/surfaces/surfaces_type_converters.cc
index fadbb97..a8e5911 100644
--- a/mojo/converters/surfaces/surfaces_type_converters.cc
+++ b/mojo/converters/surfaces/surfaces_type_converters.cc
@@ -368,12 +368,12 @@ PassPtr TypeConverter<PassPtr, cc::RenderPass>::Convert(
input.shared_quad_state_list.begin();
for (auto iter = input.quad_list.cbegin(); iter != input.quad_list.cend();
++iter) {
- const cc::DrawQuad& quad = *iter;
+ const cc::DrawQuad& quad = **iter;
quads[iter.index()] = Quad::From(quad);
if (quad.shared_quad_state != last_sqs) {
shared_quad_state[next_sqs_iter.index()] =
- SharedQuadState::From(*next_sqs_iter);
- last_sqs = &*next_sqs_iter;
+ SharedQuadState::From(**next_sqs_iter);
+ last_sqs = *next_sqs_iter;
++next_sqs_iter;
}
DCHECK_LE(next_sqs_iter.index() - 1, UINT32_MAX);
@@ -408,7 +408,7 @@ TypeConverter<scoped_ptr<cc::RenderPass>, PassPtr>::Convert(
while (quad->shared_quad_state_index > sqs_iter.index()) {
++sqs_iter;
}
- if (!ConvertDrawQuad(quad, &*sqs_iter, pass.get()))
+ if (!ConvertDrawQuad(quad, *sqs_iter, pass.get()))
return scoped_ptr<cc::RenderPass>();
}
return pass.Pass();