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

skia/skia.gyp

Index: skia/skia.gyp
diff --git a/skia/skia.gyp b/skia/skia.gyp
index 2103c4bd76df56f00facc1848f82500aec969946..4baf2b0d892091d7f2a9fb459c32520e056633ec 100644
--- a/skia/skia.gyp
+++ b/skia/skia.gyp
@@ -171,6 +171,19 @@
       ],
     },
     {
+      'target_name': 'skia_interfaces_mojom',
+      'type': 'none',
+      'variables': {
+        'mojom_files': [
+          'public/interfaces/bitmap.mojom',
+        ],
+        'mojom_typemaps': [
+          'public/interfaces/skbitmap.typemap',
+        ],
+      },
+      'includes': [ '../mojo/mojom_bindings_generator_explicit.gypi' ],
+    },
+    {
       'target_name': 'skia_mojo',
       'type': 'static_library',
       # The optimize: 'max' scattered throughout are particularly
@@ -180,17 +193,16 @@
       'variables': {
         'optimize': 'max',
       },
+      'sources': [
+        '../skia/public/interfaces/bitmap_skbitmap_struct_traits.cc',
+      ],
       'dependencies': [
         'skia',
+        'skia_interfaces_mojom',
         '../base/base.gyp:base',
       ],
-      'includes': [
-        '../mojo/mojom_bindings_generator.gypi',
-      ],
-      'sources': [
-        # Note: file list duplicated in GN build.
-        'public/interfaces/bitmap.mojom',
-        'public/type_converters.cc',
+      'export_dependent_settings': [
+        'skia',
       ],
     },
   ],