Split transform_converters.h from geometry_type_converters.h.

mojo/converters/geometry/BUILD.gn

Index: mojo/converters/geometry/BUILD.gn
diff --git a/mojo/converters/geometry/BUILD.gn b/mojo/converters/geometry/BUILD.gn
index db0aea944ce73a38092910025578d20a4feed6fd..140a3e46fab03643106f9a27807f6fe81a9f1626 100644
--- a/mojo/converters/geometry/BUILD.gn
+++ b/mojo/converters/geometry/BUILD.gn
@@ -2,15 +2,22 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-# GYP version: mojo/mojo_converters.gypi:mojo_geometry_lib

[wtc, 2015/02/11 00:33:18]

I removed this comment because there is no mojo_converters.gypi in the Chromium
source tree.

+source_set("geometry_export") {
+  sources = [
+    "mojo_geometry_export.h",
+  ]
+}
+
+# This target does NOT depend on skia. One can depend on this target to avoid
+# picking up a dependency on skia.
 component("geometry") {
   output_name = "mojo_geometry_lib"
 
   public_deps = [
-    "//ui/gfx",
+    "//ui/gfx/geometry",
   ]
   deps = [
-    "//skia",
+    ":geometry_export",
     "//ui/gfx/geometry",
     "//mojo/environment:chromium",
     "//third_party/mojo/src/mojo/public/c/system:for_component",
@@ -22,6 +29,28 @@ component("geometry") {
   sources = [
     "geometry_type_converters.cc",
     "geometry_type_converters.h",
-    "mojo_geometry_export.h",
+  ]
+}
+
+component("transform") {
+  output_name = "mojo_transform_lib"
+
+  public_deps = [
+    "//ui/gfx",
+  ]
+  deps = [
+    ":geometry_export",
+    "//skia",
+    "//ui/gfx",
+    "//mojo/environment:chromium",
+    "//third_party/mojo/src/mojo/public/c/system:for_component",
+    "//third_party/mojo_services/src/geometry/public/interfaces",
+  ]
+
+  defines = [ "MOJO_GEOMETRY_IMPLEMENTATION" ]

[jamesr, 2015/02/12 18:26:20]

You can't have two components with the same export macro - on windows the
declspec will be wrong since it's different for things inside the component and
things outside.  If you want two components then you need different export
macros and headers.

[wtc, 2015/02/12 22:36:38]

Hmm... you're right. I overlooked this issue.

I just analyzed the code. Since the two components are independent of each
other, it should be fine for the two components to share the same export macro
and header. These grep commands show the two *_converters.cc files do not
include the .h file of the other component:

wtc@fips:~/chrome-ensemble.2/src/mojo/converters/geometry$ ls
BUILD.gn                     geometry_type_converters.h  transform_converters.h
DEPS                         mojo_geometry_export.h
geometry_type_converters.cc  transform_converters.cc
wtc@fips:~/chrome-ensemble.2/src/mojo/converters/geometry$ grep
transform_converters.h *
BUILD.gn:    "transform_converters.h",
transform_converters.cc:#include
"mojo/converters/geometry/transform_converters.h"
wtc@fips:~/chrome-ensemble.2/src/mojo/converters/geometry$ grep
geometry_type_converters.h *
BUILD.gn:    "geometry_type_converters.h",
geometry_type_converters.cc:#include
"mojo/converters/geometry/geometry_type_converters.h"

If you think this is error-prone, would you like me to move the Transform
converters to the mojo/converters/surfaces component, which is the only user of
the Transform converters?

+
+  sources = [
+    "transform_converters.cc",
+    "transform_converters.h",
   ]
 }