components/bitmap_uploader/bitmap_uploader.cc - Issue 1527183003: Change mojo enums to be scoped enums in the generated C++ bindings.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: components/bitmap_uploader/bitmap_uploader.cc

Issue 1527183003: Change mojo enums to be scoped enums in the generated C++ bindings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@mojo-binding-equals

Patch Set: Created 4 years, 12 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 | « components/arc/test/fake_app_instance.cc ('k') | components/clipboard/clipboard_apptest.cc » ('j') | components/mus/public/interfaces/input_event_constants.mojom » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/bitmap_uploader/bitmap_uploader.cc

diff --git a/components/bitmap_uploader/bitmap_uploader.cc b/components/bitmap_uploader/bitmap_uploader.cc

index 5f7f0c5ec3f9cd952e6860a2566a5fd38a971e01..56121f1041d2a8e9ee21b2f7d00aaa3dfa6ff52a 100644

--- a/components/bitmap_uploader/bitmap_uploader.cc

+++ b/components/bitmap_uploader/bitmap_uploader.cc

@@ -52,7 +52,7 @@ BitmapUploader::~BitmapUploader() {

}

void BitmapUploader::Init(mojo::Shell* shell) {

- surface_ = window_->RequestSurface(mus::mojom::SURFACE_TYPE_DEFAULT);

+ surface_ = window_->RequestSurface(mus::mojom::SurfaceType::DEFAULT);

surface_->BindToThread();

mojo::ServiceProviderPtr gpu_service_provider;

@@ -137,7 +137,7 @@ void BitmapUploader::Upload() {

mus::mojom::TransferableResource::New();

resource->id = next_resource_id_++;

resource_to_texture_id_map_[resource->id] = texture_id;

- resource->format = mus::mojom::RESOURCE_FORMAT_RGBA_8888;

+ resource->format = mus::mojom::ResourceFormat::RGBA_8888;

resource->filter = GL_LINEAR;

resource->size = bitmap_size.Clone();

mus::mojom::MailboxHolderPtr mailbox_holder =

@@ -153,7 +153,7 @@ void BitmapUploader::Upload() {

resource->is_software = false;

mus::mojom::QuadPtr quad = mus::mojom::Quad::New();

- quad->material = mus::mojom::MATERIAL_TEXTURE_CONTENT;

+ quad->material = mus::mojom::Material::TEXTURE_CONTENT;

mojo::RectPtr rect = mojo::Rect::New();

if (width_ <= bounds.width() && height_ <= bounds.height()) {

@@ -199,7 +199,7 @@ void BitmapUploader::Upload() {

if (color_ != g_transparent_color) {

mus::mojom::QuadPtr quad = mus::mojom::Quad::New();

- quad->material = mus::mojom::MATERIAL_SOLID_COLOR;

+ quad->material = mus::mojom::Material::SOLID_COLOR;

quad->rect = mojo::Rect::From(bounds);

quad->opaque_rect = mojo::Rect::New();

quad->visible_rect = mojo::Rect::From(bounds);