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

Unified Diff: examples/bitmap_uploader/bitmap_uploader.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 | « apps/moterm/moterm_view.cc ('k') | examples/browser/browser.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: examples/bitmap_uploader/bitmap_uploader.cc
diff --git a/examples/bitmap_uploader/bitmap_uploader.cc b/examples/bitmap_uploader/bitmap_uploader.cc
index a21e78c5721653f3047d4f9acb1acd61d75aa23f..8fbe65e89e1faf69f7a982a3beb30aea5c8ad541 100644
--- a/examples/bitmap_uploader/bitmap_uploader.cc
+++ b/examples/bitmap_uploader/bitmap_uploader.cc
@@ -151,7 +151,7 @@ void BitmapUploader::Upload() {
TransferableResourcePtr resource = TransferableResource::New();
resource->id = next_resource_id_++;
resource_to_texture_id_map_[resource->id] = texture_id;
- resource->format = mojo::RESOURCE_FORMAT_RGBA_8888;
+ resource->format = mojo::ResourceFormat::RGBA_8888;
resource->filter = GL_LINEAR;
resource->size = bitmap_size.Clone();
MailboxHolderPtr mailbox_holder = MailboxHolder::New();
@@ -165,7 +165,7 @@ void BitmapUploader::Upload() {
resource->is_software = false;
QuadPtr quad = Quad::New();
- quad->material = MATERIAL_TEXTURE_CONTENT;
+ quad->material = Material::TEXTURE_CONTENT;
RectPtr rect = Rect::New();
if (width_ <= size.width && height_ <= size.height) {
@@ -210,7 +210,7 @@ void BitmapUploader::Upload() {
if (color_ != TRANSPARENT_COLOR) {
QuadPtr quad = Quad::New();
- quad->material = MATERIAL_SOLID_COLOR;
+ quad->material = Material::SOLID_COLOR;
quad->rect = bounds.Clone();
quad->opaque_rect = Rect::New();
quad->visible_rect = bounds.Clone();
« no previous file with comments | « apps/moterm/moterm_view.cc ('k') | examples/browser/browser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698