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

Unified Diff: apps/moterm/gl_helper.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 | « no previous file | apps/moterm/gl_helper_test_app.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: apps/moterm/gl_helper.cc
diff --git a/apps/moterm/gl_helper.cc b/apps/moterm/gl_helper.cc
index 058f523156dd7c18a508a85f3817b761385deecd..85a801a7efcc9b76ffdc38523bb965fb630bb9e4 100644
--- a/apps/moterm/gl_helper.cc
+++ b/apps/moterm/gl_helper.cc
@@ -108,7 +108,7 @@ uint32_t GlHelper::EndFrame() {
TextureInfo(resource->id, frame_texture_, current_surface_size_));
frame_texture_ = 0;
// TODO(vtl): This is wrong, but doesn't seem to have an effect.
- resource->format = mojo::RESOURCE_FORMAT_RGBA_8888;
+ resource->format = mojo::ResourceFormat::RGBA_8888;
resource->filter = GL_LINEAR;
resource->size = current_surface_size_.Clone();
mojo::MailboxHolderPtr mailbox_holder = mojo::MailboxHolder::New();
@@ -126,7 +126,7 @@ uint32_t GlHelper::EndFrame() {
mojo::Pass* pass = frame->passes[0].get();
pass->quads.push_back(mojo::Quad::New());
mojo::Quad* quad = pass->quads[0].get();
- quad->material = mojo::MATERIAL_TEXTURE_CONTENT;
+ quad->material = mojo::Material::TEXTURE_CONTENT;
quad->rect = size_rect.Clone();
quad->opaque_rect = size_rect.Clone();
quad->visible_rect = size_rect.Clone();
« no previous file with comments | « no previous file | apps/moterm/gl_helper_test_app.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698