Add ArrayTraits<CArray<T>> utility template

skia/public/interfaces/bitmap_skbitmap_struct_traits.cc

Index: skia/public/interfaces/bitmap_skbitmap_struct_traits.cc
diff --git a/skia/public/interfaces/bitmap_skbitmap_struct_traits.cc b/skia/public/interfaces/bitmap_skbitmap_struct_traits.cc
index 904a8436c92573023e5366f2c07e732543dba947..1efcad77d12e1f9dc33da0060cf19b3abb96ca75 100644
--- a/skia/public/interfaces/bitmap_skbitmap_struct_traits.cc
+++ b/skia/public/interfaces/bitmap_skbitmap_struct_traits.cc
@@ -112,37 +112,6 @@ skia::mojom::ColorProfileType SkProfileTypeToMojo(SkColorProfileType type) {
 }  // namespace
 
 // static
-size_t ArrayTraits<BitmapBuffer>::GetSize(const BitmapBuffer& b) {
-  return b.size;
-}
-
-// static
-uint8_t* ArrayTraits<BitmapBuffer>::GetData(BitmapBuffer& b) {
-  return b.data;
-}
-
-// static
-const uint8_t* ArrayTraits<BitmapBuffer>::GetData(const BitmapBuffer& b) {
-  return b.data;
-}
-
-// static
-uint8_t& ArrayTraits<BitmapBuffer>::GetAt(BitmapBuffer& b, size_t i) {
-  return *(b.data + i);
-}
-
-// static
-const uint8_t& ArrayTraits<BitmapBuffer>::GetAt(const BitmapBuffer& b,
-                                                size_t i) {
-  return *(b.data + i);
-}
-
-// static
-bool ArrayTraits<BitmapBuffer>::Resize(BitmapBuffer& b, size_t size) {
-  return b.size == size;
-}
-
-// static
 bool StructTraits<skia::mojom::Bitmap, SkBitmap>::IsNull(const SkBitmap& b) {
   return b.isNull();
 }
@@ -184,9 +153,8 @@ uint32_t StructTraits<skia::mojom::Bitmap, SkBitmap>::height(
 // static
 BitmapBuffer StructTraits<skia::mojom::Bitmap, SkBitmap>::pixel_data(
     const SkBitmap& b) {
-  BitmapBuffer bitmap_buffer;
-  bitmap_buffer.data = static_cast<uint8_t*>(b.getPixels());
-  bitmap_buffer.size = b.getSize();
+  BitmapBuffer bitmap_buffer = {b.getSize(), b.getSize(),

[Tom Sepez, 2016/06/08 17:38:47]

nit: same here.

[Fady Samuel, 2016/06/08 17:48:03]

Done.

+                                static_cast<uint8_t*>(b.getPixels())};
   return bitmap_buffer;
 }
 
@@ -215,10 +183,9 @@ bool StructTraits<skia::mojom::Bitmap, SkBitmap>::Read(
     return false;
   }
 
-  BitmapBuffer bitmap_buffer;
-  bitmap_buffer.data = static_cast<uint8_t*>(b->getPixels());
-  bitmap_buffer.size = b->getSize();
-  if (!data.ReadPixelData(&bitmap_buffer))
+  BitmapBuffer bitmap_buffer = {0, b->getSize(),
+                                static_cast<uint8_t*>(b->getPixels())};
+  if (!data.ReadPixelData(&bitmap_buffer) || bitmap_buffer.size != b->getSize())
     return false;
 
   b->notifyPixelsChanged();