[mojo] Get rid of Skia type converters

mojo/public/tools/bindings/mojom.gni

 # Copyright 2014 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.
 
 mojom_generator_root = "//mojo/public/tools/bindings"
 mojom_generator_script = "$mojom_generator_root/mojom_bindings_generator.py"
 mojom_generator_sources = [
   "$mojom_generator_root/generators/mojom_cpp_generator.py",
   "$mojom_generator_root/generators/mojom_js_generator.py",
   "$mojom_generator_root/generators/mojom_java_generator.py",
@@ skipping 19 matching lines @@
 # input file.
 #
 # Parameters:
 #
 #   sources (optional if one of the deps sets listed below is present)
 #       List of source .mojom files to compile.
 #
 #   deps (optional)
 #       Note: this can contain only other mojom targets.
 #
+#       DEPRECATED: This is synonymous with public_deps because all mojom
+#       dependencies must be public by design. Please use public_deps.

[jam, 2016/02/01 17:53:48]

is there a bug on removing this? if not, please create one and reference it
here.

+#
 #   public_deps (optional)
 #       Note: this can contain only other mojom targets.
 #
 #   import_dirs (optional)
 #       List of import directories that will get added when processing sources.
 #
 #   with_environment (optional)
 #       Set to |false| to omit an implicit bindings dependency on the Chromium
 #       Mojo environment implementation. Defaults to |true| and in general
 #       should only be overridden by mojom targets within the Mojo EDK.
 #
 #   typemaps (optional)
 #       A list of typemap files to apply during bindings generation.
 #
+#   typemap_deps (optional)
+#       A list of public dependencies needed to support active typemaps.
+#
 #   variant (optional)
 #       A variant name to apply to generated bindings. Variant influences
 #       generated source filenames as wells the symbols they define.
 #
 #   testonly (optional)
 #
 #   visibility (optional)
 template("mojom") {
   assert(
       defined(invoker.sources) || defined(invoker.deps) ||
           defined(invoker.public_deps),
       "\"sources\" or \"deps\" must be defined for the $target_name template.")
 
   cpp_sources_suffix = "cpp_sources"
   cpp_sources_target_name = "${target_name}_${cpp_sources_suffix}"
+  cpp_only = false
   if (defined(invoker.sources)) {
     if (defined(invoker.variant)) {
       variant = invoker.variant
+      cpp_only = true
       generator_cpp_outputs = [
         "{{source_gen_dir}}/{{source_name_part}}.mojom-${variant}.cc",
         "{{source_gen_dir}}/{{source_name_part}}.mojom-${variant}.h",
         "{{source_gen_dir}}/{{source_name_part}}.mojom-${variant}-internal.h",
       ]
-      generator_js_outputs = []
-      generator_java_outputs = []
     } else {
       generator_cpp_outputs = [
         "{{source_gen_dir}}/{{source_name_part}}.mojom.cc",
         "{{source_gen_dir}}/{{source_name_part}}.mojom.h",
         "{{source_gen_dir}}/{{source_name_part}}.mojom-internal.h",
       ]
-      generator_js_outputs =
-          [ "{{source_gen_dir}}/{{source_name_part}}.mojom.js" ]
-      generator_java_outputs =
-          [ "{{source_gen_dir}}/{{source_name_part}}.mojom.srcjar" ]
     }
   }
 
+  if (cpp_only) {
+    generator_js_outputs = []
+    generator_java_outputs = []
+  } else {
+    generator_js_outputs =
+        [ "{{source_gen_dir}}/{{source_name_part}}.mojom.js" ]
+    generator_java_outputs =
+        [ "{{source_gen_dir}}/{{source_name_part}}.mojom.srcjar" ]
+  }
+
   if (defined(invoker.sources)) {
     generator_target_name = target_name + "__generator"
     action_foreach(generator_target_name) {
       script = mojom_generator_script
       inputs = mojom_generator_sources
       sources = invoker.sources
       deps = [
         "//mojo/public/tools/bindings:precompile_templates",
       ]
       outputs =
@@ skipping 14 matching lines @@
 
       if (defined(invoker.import_dirs)) {
         foreach(import_dir, invoker.import_dirs) {
           args += [
             "-I",
             rebase_path(import_dir, root_build_dir),
           ]
         }
       }
 
-      if (defined(invoker.variant)) {
+      if (cpp_only) {
         args += [
-          "--variant",
-          invoker.variant,
           "-g",
           "c++",
         ]
       } else {
         args += [
           "-g",
           "c++,javascript,java",
         ]
       }
 
+      if (defined(invoker.variant)) {
+        args += [
+          "--variant",
+          invoker.variant,
+        ]
+      }
+
       if (defined(invoker.typemaps)) {
         foreach(typemap, invoker.typemaps) {
           args += [
             "--typemap",
             rebase_path(typemap, root_build_dir),
           ]
         }
+        inputs += invoker.typemaps
       }
     }
   }
 
   source_set(target_name) {
     if (defined(invoker.visibility)) {
       visibility = invoker.visibility
     }
     if (defined(invoker.testonly)) {
       testonly = invoker.testonly
     }
     if (defined(invoker.sources) && !defined(invoker.variant)) {
       data = process_file_template(invoker.sources, generator_js_outputs)
     }
 
     public_deps = [
       "//mojo/public/cpp/bindings",
     ]
     if (defined(invoker.sources)) {
       public_deps += [ ":${cpp_sources_target_name}" ]
     }
+    if (defined(invoker.deps)) {
+      public_deps += invoker.deps
+    }
     if (defined(invoker.public_deps)) {
       public_deps += invoker.public_deps
     }
+    if (defined(invoker.typemap_deps)) {
+      public_deps += invoker.typemap_deps
+    }
 
     deps = []
     if (defined(invoker.sources)) {
       public_deps += [ ":$generator_target_name" ]
     }
-    if (defined(invoker.deps)) {
-      deps += invoker.deps
-    }
   }
 
   all_deps = []
   if (defined(invoker.deps)) {
     all_deps += invoker.deps
   }
   if (defined(invoker.public_deps)) {
     all_deps += invoker.public_deps
   }
 
@@ skipping 18 matching lines @@
     # on mojo/public/cpp/bindings. No external targets should depend directly on
     # this target *except* mojo/public/cpp/bindings and other *_cpp_sources
     # targets.
     source_set(cpp_sources_target_name) {
       if (defined(invoker.testonly)) {
         testonly = invoker.testonly
       }
       sources = process_file_template(invoker.sources, generator_cpp_outputs)
       deps = [
         ":$generator_target_name",
-        "//base",
         "//mojo/public/interfaces/bindings:bindings__generator",
       ]
+      public_deps = [
+        "//base",
+      ]
+      if (defined(invoker.typemap_deps)) {
+        public_deps += invoker.typemap_deps
+      }
       foreach(d, all_deps) {
         # Resolve the name, so that a target //mojo/something becomes
         # //mojo/something:something and we can append cpp_sources_suffix to
         # get the cpp dependency name.
         full_name = get_label_info(d, "label_no_toolchain")
         deps += [ "${full_name}_${cpp_sources_suffix}" ]
       }
       if (!defined(invoker.with_environment) || invoker.with_environment) {
         deps += [ "//mojo/environment:chromium" ]
       }
@@ skipping 35 matching lines @@
         # //mojo/something:something and we can append "_java" to get the java
         # dependency name.
         full_name = get_label_info(d, "label_no_toolchain")
         deps += [ "${full_name}_java" ]
       }
 
       srcjar_deps = [ ":$java_srcjar_target_name" ]
     }
   }
 }