Add SkBitmap StructTraits for skia::mojo::Bitmap.

skia/public/type_converters.cc

Index: skia/public/type_converters.cc
diff --git a/skia/public/type_converters.cc b/skia/public/type_converters.cc
deleted file mode 100644
index 939bf6db14b40401f88bb00a0b3715314317fb9c..0000000000000000000000000000000000000000
--- a/skia/public/type_converters.cc
+++ /dev/null
@@ -1,141 +0,0 @@
-// Copyright 2015 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/type_converters.h"
-
-#include <stddef.h>
-#include <stdint.h>
-#include <string.h>
-
-#include "base/logging.h"
-#include "third_party/skia/include/core/SkBitmap.h"
-
-namespace mojo {
-
-namespace {
-
-SkColorType MojoColorTypeToSk(skia::mojom::ColorType type) {
-  switch (type) {
-    case skia::mojom::ColorType::UNKNOWN:
-      return kUnknown_SkColorType;
-    case skia::mojom::ColorType::ALPHA_8:
-      return kAlpha_8_SkColorType;
-    case skia::mojom::ColorType::RGB_565:
-      return kRGB_565_SkColorType;
-    case skia::mojom::ColorType::ARGB_4444:
-      return kARGB_4444_SkColorType;
-    case skia::mojom::ColorType::RGBA_8888:
-      return kRGBA_8888_SkColorType;
-    case skia::mojom::ColorType::BGRA_8888:
-      return kBGRA_8888_SkColorType;
-    case skia::mojom::ColorType::INDEX_8:
-      return kIndex_8_SkColorType;
-    case skia::mojom::ColorType::GRAY_8:
-      return kGray_8_SkColorType;
-    default:
-      NOTREACHED();
-  }
-  return kUnknown_SkColorType;
-}
-
-SkAlphaType MojoAlphaTypeToSk(skia::mojom::AlphaType type) {
-  switch (type) {
-    case skia::mojom::AlphaType::UNKNOWN:
-      return kUnknown_SkAlphaType;
-    case skia::mojom::AlphaType::ALPHA_TYPE_OPAQUE:
-      return kOpaque_SkAlphaType;
-    case skia::mojom::AlphaType::PREMUL:
-      return kPremul_SkAlphaType;
-    case skia::mojom::AlphaType::UNPREMUL:
-      return kUnpremul_SkAlphaType;
-    default:
-      NOTREACHED();
-  }
-  return kUnknown_SkAlphaType;
-}
-
-skia::mojom::ColorType SkColorTypeToMojo(SkColorType type) {
-  switch (type) {
-    case kUnknown_SkColorType:
-      return skia::mojom::ColorType::UNKNOWN;
-    case kAlpha_8_SkColorType:
-      return skia::mojom::ColorType::ALPHA_8;
-    case kRGB_565_SkColorType:
-      return skia::mojom::ColorType::RGB_565;
-    case kARGB_4444_SkColorType:
-      return skia::mojom::ColorType::ARGB_4444;
-    case kRGBA_8888_SkColorType:
-      return skia::mojom::ColorType::RGBA_8888;
-    case kBGRA_8888_SkColorType:
-      return skia::mojom::ColorType::BGRA_8888;
-    case kIndex_8_SkColorType:
-      return skia::mojom::ColorType::INDEX_8;
-    case kGray_8_SkColorType:
-      return skia::mojom::ColorType::GRAY_8;
-    default:
-      NOTREACHED();
-  }
-  return skia::mojom::ColorType::UNKNOWN;
-}
-
-skia::mojom::AlphaType SkAlphaTypeToMojo(SkAlphaType type) {
-  switch (type) {
-    case kUnknown_SkAlphaType:
-      return skia::mojom::AlphaType::UNKNOWN;
-    case kOpaque_SkAlphaType:
-      return skia::mojom::AlphaType::ALPHA_TYPE_OPAQUE;
-    case kPremul_SkAlphaType:
-      return skia::mojom::AlphaType::PREMUL;
-    case kUnpremul_SkAlphaType:
-      return skia::mojom::AlphaType::UNPREMUL;
-    default:
-      NOTREACHED();
-  }
-  return skia::mojom::AlphaType::UNKNOWN;
-}
-
-}  // namespace
-
-SkBitmap TypeConverter<SkBitmap, skia::mojom::BitmapPtr>::Convert(
-    const skia::mojom::BitmapPtr& image) {
-  SkBitmap bitmap;
-  if (image.is_null())
-    return bitmap;
-  if (!bitmap.tryAllocPixels(SkImageInfo::Make(
-          image->width, image->height, MojoColorTypeToSk(image->color_type),
-          MojoAlphaTypeToSk(image->alpha_type)))) {
-    return SkBitmap();
-  }
-  if (bitmap.getSize() != image->pixel_data.size() || !bitmap.getPixels()) {
-    return SkBitmap();
-  }
-
-  memcpy(bitmap.getPixels(), &image->pixel_data[0], bitmap.getSize());
-  return bitmap;
-}
-
-skia::mojom::BitmapPtr TypeConverter<skia::mojom::BitmapPtr, SkBitmap>::Convert(
-    const SkBitmap& bitmap) {
-  if (bitmap.isNull())
-    return nullptr;
-
-  // NOTE: This code doesn't correctly serialize Index8 bitmaps.
-  const SkImageInfo& info = bitmap.info();
-  DCHECK_NE(info.colorType(), kIndex_8_SkColorType);
-  if (info.colorType() == kIndex_8_SkColorType)
-    return nullptr;
-  skia::mojom::BitmapPtr result = skia::mojom::Bitmap::New();
-  result->color_type = SkColorTypeToMojo(info.colorType());
-  result->alpha_type = SkAlphaTypeToMojo(info.alphaType());
-  result->width = info.width();
-  result->height = info.height();
-  size_t size = bitmap.getSize();
-  size_t row_bytes = bitmap.rowBytes();
-  result->pixel_data = mojo::Array<uint8_t>::New(size);
-  if (!bitmap.readPixels(info, &result->pixel_data[0], row_bytes, 0, 0))
-    return nullptr;
-  return result;
-}
-
-}  // namespace mojo