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

Unified Diff: services/view_manager/display_manager.cc

Issue 1375313006: For c++, Generate enum classes instead of enum from mojom. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: 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
« no previous file with comments | « services/view_manager/connection_manager.cc ('k') | services/view_manager/gesture_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/view_manager/display_manager.cc
diff --git a/services/view_manager/display_manager.cc b/services/view_manager/display_manager.cc
index 054be8be7ddf90d54e96f7cf9301a14fd90598e2..a1cd6e2fcccb4fe4432b3f45897cbe4189b4cd2a 100644
--- a/services/view_manager/display_manager.cc
+++ b/services/view_manager/display_manager.cc
@@ -48,7 +48,7 @@ void DrawViewTree(mojo::Pass* pass,
const gfx::Rect bounds_at_origin(view->bounds().size());
auto surface_quad = mojo::Quad::New();
- surface_quad->material = mojo::Material::MATERIAL_SURFACE_CONTENT;
+ surface_quad->material = mojo::Material::SURFACE_CONTENT;
surface_quad->rect = mojo::Rect::From(bounds_at_origin);
surface_quad->opaque_rect = mojo::Rect::From(bounds_at_origin);
surface_quad->visible_rect = mojo::Rect::From(bounds_at_origin);
@@ -58,7 +58,7 @@ void DrawViewTree(mojo::Pass* pass,
surface_quad->surface_quad_state = surface_quad_state.Pass();
auto sqs = CreateDefaultSQS(*mojo::Size::From(view->bounds().size()));
- sqs->blend_mode = mojo::SK_XFERMODE_kSrcOver_Mode;
+ sqs->blend_mode = mojo::SkXfermode::kSrcOver_Mode;
sqs->opacity = combined_opacity;
sqs->content_to_target_transform = mojo::Transform::From(node_transform);
« no previous file with comments | « services/view_manager/connection_manager.cc ('k') | services/view_manager/gesture_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698