Enable SkBitmap to be used by Mojo in Blink

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
index 939bf6db14b40401f88bb00a0b3715314317fb9c..47c7b8c11c537ecfd51c4ee412860733577feb19 100644
--- a/skia/public/type_converters.cc
+++ b/skia/public/type_converters.cc
@@ -15,23 +15,23 @@ namespace mojo {
 
 namespace {
 
-SkColorType MojoColorTypeToSk(skia::mojom::ColorType type) {
+SkColorType MojoColorTypeToSk(blink::mojom::ColorType type) {
   switch (type) {
-    case skia::mojom::ColorType::UNKNOWN:
+    case blink::mojom::ColorType::UNKNOWN:
       return kUnknown_SkColorType;
-    case skia::mojom::ColorType::ALPHA_8:
+    case blink::mojom::ColorType::ALPHA_8:
       return kAlpha_8_SkColorType;
-    case skia::mojom::ColorType::RGB_565:
+    case blink::mojom::ColorType::RGB_565:
       return kRGB_565_SkColorType;
-    case skia::mojom::ColorType::ARGB_4444:
+    case blink::mojom::ColorType::ARGB_4444:
       return kARGB_4444_SkColorType;
-    case skia::mojom::ColorType::RGBA_8888:
+    case blink::mojom::ColorType::RGBA_8888:
       return kRGBA_8888_SkColorType;
-    case skia::mojom::ColorType::BGRA_8888:
+    case blink::mojom::ColorType::BGRA_8888:
       return kBGRA_8888_SkColorType;
-    case skia::mojom::ColorType::INDEX_8:
+    case blink::mojom::ColorType::INDEX_8:
       return kIndex_8_SkColorType;
-    case skia::mojom::ColorType::GRAY_8:
+    case blink::mojom::ColorType::GRAY_8:
       return kGray_8_SkColorType;
     default:
       NOTREACHED();
@@ -39,15 +39,15 @@ SkColorType MojoColorTypeToSk(skia::mojom::ColorType type) {
   return kUnknown_SkColorType;
 }
 
-SkAlphaType MojoAlphaTypeToSk(skia::mojom::AlphaType type) {
+SkAlphaType MojoAlphaTypeToSk(blink::mojom::AlphaType type) {
   switch (type) {
-    case skia::mojom::AlphaType::UNKNOWN:
+    case blink::mojom::AlphaType::UNKNOWN:
       return kUnknown_SkAlphaType;
-    case skia::mojom::AlphaType::ALPHA_TYPE_OPAQUE:
+    case blink::mojom::AlphaType::ALPHA_TYPE_OPAQUE:
       return kOpaque_SkAlphaType;
-    case skia::mojom::AlphaType::PREMUL:
+    case blink::mojom::AlphaType::PREMUL:
       return kPremul_SkAlphaType;
-    case skia::mojom::AlphaType::UNPREMUL:
+    case blink::mojom::AlphaType::UNPREMUL:
       return kUnpremul_SkAlphaType;
     default:
       NOTREACHED();
@@ -55,50 +55,50 @@ SkAlphaType MojoAlphaTypeToSk(skia::mojom::AlphaType type) {
   return kUnknown_SkAlphaType;
 }
 
-skia::mojom::ColorType SkColorTypeToMojo(SkColorType type) {
+blink::mojom::ColorType SkColorTypeToMojo(SkColorType type) {
   switch (type) {
     case kUnknown_SkColorType:
-      return skia::mojom::ColorType::UNKNOWN;
+      return blink::mojom::ColorType::UNKNOWN;
     case kAlpha_8_SkColorType:
-      return skia::mojom::ColorType::ALPHA_8;
+      return blink::mojom::ColorType::ALPHA_8;
     case kRGB_565_SkColorType:
-      return skia::mojom::ColorType::RGB_565;
+      return blink::mojom::ColorType::RGB_565;
     case kARGB_4444_SkColorType:
-      return skia::mojom::ColorType::ARGB_4444;
+      return blink::mojom::ColorType::ARGB_4444;
     case kRGBA_8888_SkColorType:
-      return skia::mojom::ColorType::RGBA_8888;
+      return blink::mojom::ColorType::RGBA_8888;
     case kBGRA_8888_SkColorType:
-      return skia::mojom::ColorType::BGRA_8888;
+      return blink::mojom::ColorType::BGRA_8888;
     case kIndex_8_SkColorType:
-      return skia::mojom::ColorType::INDEX_8;
+      return blink::mojom::ColorType::INDEX_8;
     case kGray_8_SkColorType:
-      return skia::mojom::ColorType::GRAY_8;
+      return blink::mojom::ColorType::GRAY_8;
     default:
       NOTREACHED();
   }
-  return skia::mojom::ColorType::UNKNOWN;
+  return blink::mojom::ColorType::UNKNOWN;
 }
 
-skia::mojom::AlphaType SkAlphaTypeToMojo(SkAlphaType type) {
+blink::mojom::AlphaType SkAlphaTypeToMojo(SkAlphaType type) {
   switch (type) {
     case kUnknown_SkAlphaType:
-      return skia::mojom::AlphaType::UNKNOWN;
+      return blink::mojom::AlphaType::UNKNOWN;
     case kOpaque_SkAlphaType:
-      return skia::mojom::AlphaType::ALPHA_TYPE_OPAQUE;
+      return blink::mojom::AlphaType::ALPHA_TYPE_OPAQUE;
     case kPremul_SkAlphaType:
-      return skia::mojom::AlphaType::PREMUL;
+      return blink::mojom::AlphaType::PREMUL;
     case kUnpremul_SkAlphaType:
-      return skia::mojom::AlphaType::UNPREMUL;
+      return blink::mojom::AlphaType::UNPREMUL;
     default:
       NOTREACHED();
   }
-  return skia::mojom::AlphaType::UNKNOWN;
+  return blink::mojom::AlphaType::UNKNOWN;
 }
 
 }  // namespace
 
-SkBitmap TypeConverter<SkBitmap, skia::mojom::BitmapPtr>::Convert(
-    const skia::mojom::BitmapPtr& image) {
+SkBitmap TypeConverter<SkBitmap, blink::mojom::BitmapPtr>::Convert(
+    const blink::mojom::BitmapPtr& image) {
   SkBitmap bitmap;
   if (image.is_null())
     return bitmap;
@@ -115,7 +115,7 @@ SkBitmap TypeConverter<SkBitmap, skia::mojom::BitmapPtr>::Convert(
   return bitmap;
 }
 
-skia::mojom::BitmapPtr TypeConverter<skia::mojom::BitmapPtr, SkBitmap>::Convert(
+blink::mojom::BitmapPtr TypeConverter<blink::mojom::BitmapPtr, SkBitmap>::Convert(
     const SkBitmap& bitmap) {
   if (bitmap.isNull())
     return nullptr;
@@ -125,7 +125,7 @@ skia::mojom::BitmapPtr TypeConverter<skia::mojom::BitmapPtr, SkBitmap>::Convert(
   DCHECK_NE(info.colorType(), kIndex_8_SkColorType);
   if (info.colorType() == kIndex_8_SkColorType)
     return nullptr;
-  skia::mojom::BitmapPtr result = skia::mojom::Bitmap::New();
+  blink::mojom::BitmapPtr result = blink::mojom::Bitmap::New();
   result->color_type = SkColorTypeToMojo(info.colorType());
   result->alpha_type = SkAlphaTypeToMojo(info.alphaType());
   result->width = info.width();