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

Unified Diff: mojo/converters/surfaces/surfaces_type_converters.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 | « gpu/command_buffer_service.gypi ('k') | mojo/services/surfaces/surfaces_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/converters/surfaces/surfaces_type_converters.cc
diff --git a/mojo/converters/surfaces/surfaces_type_converters.cc b/mojo/converters/surfaces/surfaces_type_converters.cc
index fadbb9729464ffbbbe35d4cdf3d5042da3d84738..a8e5911ccd0dd84f0734aeea0d737a7af5398a9e 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();
« no previous file with comments | « gpu/command_buffer_service.gypi ('k') | mojo/services/surfaces/surfaces_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698