Index: ui/gfx/image/mojo/image.mojom |
diff --git a/ui/gfx/image/mojo/image.mojom b/ui/gfx/image/mojo/image.mojom |
index 1301fbf002458a8ac409429ec33405da1ae318ce..5d619743e681149f20662f079e5b2ca478dfa278 100644 |
--- a/ui/gfx/image/mojo/image.mojom |
+++ b/ui/gfx/image/mojo/image.mojom |
@@ -4,29 +4,19 @@ |
module gfx.mojom; |
-// Mojo transport for a SkBitmap via shared buffer. |
-// TODO: Merge into bitmap.mojom in skia and maybe share pixel buffer directly |
-// to make less copies. |
-struct SharedBufferSkBitmap { |
- // Shared buffer handle to hold a serialized SkBitmap. |
- handle<shared_buffer> shared_buffer_handle; |
+import "skia/public/interfaces/bitmap.mojom"; |
- // Byte size of the shared buffer. |
- uint64 buffer_byte_size; |
-}; |
- |
-// Mojo transport for an ImageSkiaRep using SharedBufferSkBitmap. |
+// Mojo transport for an ImageSkiaRep. |
struct ImageSkiaRep { |
// Transport of the bitmap in this representation. |
- SharedBufferSkBitmap bitmap; |
+ skia.mojom.Bitmap bitmap; |
// Corresponding scale of the bitmap or 0 if unscaled. |
float scale; |
}; |
-// Mojo transport for an ImageSkia via shared buffer. Note that transporting an |
-// ImageSkia over mojo will load all of its image representations for supported |
-// scales. |
+// Mojo transport for an ImageSkia. Note that transporting an ImageSkia over |
+// mojo will load all of its image representations for supported scales. |
struct ImageSkia { |
array<ImageSkiaRep> image_reps; |
}; |