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

Unified Diff: mojo/converters/surfaces/surfaces_type_converters.cc

Issue 1380653003: Mac Overlays: Allow SolidColor and Tile quads to be candidates for overlays. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@AllOrNothing2
Patch Set: Plumb allow_overlay Created 5 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
« cc/layers/picture_layer_impl.cc ('K') | « content/common/cc_messages_unittest.cc ('k') | no next file » | 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 6e901dfe3958ef7366fbe9e96315a1d2905d379a..4474b382e2b31343b961598126d25c268f35600a 100644
--- a/mojo/converters/surfaces/surfaces_type_converters.cc
+++ b/mojo/converters/surfaces/surfaces_type_converters.cc
@@ -176,7 +176,8 @@ bool ConvertDrawQuad(const QuadPtr& input,
tile_state->tex_coord_rect.To<gfx::RectF>(),
tile_state->texture_size.To<gfx::Size>(),
tile_state->swizzle_contents,
- tile_state->nearest_neighbor);
+ tile_state->nearest_neighbor,
+ tile_state->allow_overlay);
break;
}
case MATERIAL_YUV_VIDEO_CONTENT: {
@@ -343,6 +344,7 @@ QuadPtr TypeConverter<QuadPtr, cc::DrawQuad>::Convert(
tile_state->texture_size = Size::From(tile_quad->texture_size);
tile_state->swizzle_contents = tile_quad->swizzle_contents;
tile_state->nearest_neighbor = tile_quad->nearest_neighbor;
+ tile_state->allow_overlay = tile_quad->allow_overlay;
tile_state->resource_id = tile_quad->resource_id();
quad->tile_quad_state = tile_state.Pass();
break;
« cc/layers/picture_layer_impl.cc ('K') | « content/common/cc_messages_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698