Add ArrayTraits<CArray<T>> utility template

skia/public/interfaces/bitmap_skbitmap_struct_traits.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "skia/public/interfaces/bitmap_skbitmap_struct_traits.h"
 
 namespace mojo {
 
 namespace {
 
@@ skipping 94 matching lines @@
     case kSRGB_SkColorProfileType:
       return skia::mojom::ColorProfileType::SRGB;
   }
   NOTREACHED();
   return skia::mojom::ColorProfileType::LINEAR;
 }
 
 }  // 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();
 }
 
 // static
 void StructTraits<skia::mojom::Bitmap, SkBitmap>::SetToNull(SkBitmap* b) {
   b->reset();
 }
 
 // static
@@ skipping 21 matching lines @@
 
 // static
 uint32_t StructTraits<skia::mojom::Bitmap, SkBitmap>::height(
     const SkBitmap& b) {
   return b.height() < 0 ? 0 : static_cast<uint32_t>(b.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;
 }
 
 // static
 bool StructTraits<skia::mojom::Bitmap, SkBitmap>::Read(
     skia::mojom::BitmapDataView data,
     SkBitmap* b) {
   // TODO: Ensure width and height are reasonable, eg. <= kMaxBitmapSize?
   *b = SkBitmap();
   if (!b->tryAllocPixels(SkImageInfo::Make(
           data.width(), data.height(), MojoColorTypeToSk(data.color_type()),
           MojoAlphaTypeToSk(data.alpha_type()),
           MojoProfileTypeToSk(data.profile_type())))) {
     return false;
   }
 
   // If the image is empty, return success after setting the image info.
   if (data.width() == 0 || data.height() == 0)
     return true;
 
   SkAutoPixmapUnlock pixmap;
   if (static_cast<uint32_t>(b->width()) != data.width() ||
       static_cast<uint32_t>(b->height()) != data.height() ||
       !b->requestLock(&pixmap) || !b->lockPixelsAreWritable() ||
       !b->readyToDraw()) {
     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();
   return true;
 }
 
 // static
 void* StructTraits<skia::mojom::Bitmap, SkBitmap>::SetUpContext(
     const SkBitmap& b) {
   b.lockPixels();
   return nullptr;
 }
 
 // static
 void StructTraits<skia::mojom::Bitmap, SkBitmap>::TearDownContext(
     const SkBitmap& b,
     void* context) {
   b.unlockPixels();
 }
 
 }  // namespace mojo