ui/gfx: Use separate components for color_space and switches

ui/gfx/BUILD.gn

 # 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.
 
 import("//build/config/ui.gni")
 import("//device/vr/features/features.gni")
 import("//testing/test.gni")
 import("//testing/libfuzzer/fuzzer_test.gni")
 
 if (is_android) {
@@ skipping 36 matching lines @@
     "android/gfx_jni_registrar.cc",
     "android/gfx_jni_registrar.h",
     "android/java_bitmap.cc",
     "android/java_bitmap.h",
     "android/view_configuration.cc",
     "android/view_configuration.h",
     "break_list.h",
     "color_analysis.cc",
     "color_analysis.h",
     "color_palette.h",
-    "color_space_win.cc",
-    "color_space_win.h",
     "color_transform.cc",
     "color_transform.h",
     "color_utils.cc",
     "color_utils.h",
     "decorated_text.cc",
     "decorated_text.h",
     "favicon_size.cc",
     "favicon_size.h",
     "font.cc",
     "font.h",
@@ skipping 12 matching lines @@
     "font_render_params_android.cc",
     "font_render_params_linux.cc",
     "font_render_params_mac.cc",
     "font_render_params_win.cc",
     "gdi_util.cc",
     "gdi_util.h",
     "gfx_paths.cc",
     "gfx_paths.h",
     "half_float.cc",
     "half_float.h",
-    "icc_profile_mac.mm",
-    "icc_profile_win.cc",
-    "icc_profile_x11.cc",
     "icon_util.cc",
     "icon_util.h",
     "image/image.cc",
     "image/image.h",
     "image/image_family.cc",
     "image/image_family.h",
     "image/image_ios.mm",
     "image/image_mac.mm",
     "image/image_png_rep.cc",
     "image/image_png_rep.h",
@@ skipping 129 matching lines @@
 
   # This is part of the gfx component in the component build.
   defines = [ "GFX_IMPLEMENTATION" ]
 
   public_deps = [
     ":color_space",
     ":geometry_skia",
     ":memory_buffer_sources",
     ":native_widget_types",
     ":selection_bound_sources",
-    ":switches_sources",
+    ":switches",
     "//base",
     "//skia",
     "//third_party/icu",
     "//ui/gfx/animation",
     "//ui/gfx/codec",
     "//ui/gfx/geometry",
     "//ui/gfx/range",
   ]
   deps = [
     ":gfx_export",
@@ skipping 126 matching lines @@
     sources -= [
       "nine_image_painter.cc",
       "nine_image_painter.h",
     ]
   }
 
   if (use_x11) {
     deps += [ "//ui/gfx/x" ]
     configs += [ "//build/config/linux:x11" ]
   } else {
-    sources -= [
-      "icc_profile_x11.cc",
-      "path_x11.cc",
-    ]
+    sources -= [ "path_x11.cc" ]
   }
 
   if (use_cairo) {
     configs += [ "//build/config/linux/pangocairo" ]
   }
 }
 
 component("color_space") {
   sources = [
     "color_space.cc",
     "color_space.h",
+    "color_space_win.cc",
+    "color_space_win.h",
     "icc_profile.cc",
     "icc_profile.h",
+    "icc_profile_mac.mm",
+    "icc_profile_win.cc",
+    "icc_profile_x11.cc",
     "skia_color_space_util.cc",
     "skia_color_space_util.h",

[Nico, 2017/06/01 14:52:14]

add new export.h file here

   ]
   public_deps = [
     ":gfx_export",
     "//base",
     "//skia",
   ]
   deps = [
-    ":switches_sources",
+    ":switches",
     "//base",
     "//skia",
   ]
-  defines = [ "GFX_IMPLEMENTATION" ]
+  defines = [ "GFX_COLOR_IMPLEMENTATION" ]

[Nico, 2017/06/01 14:52:14]

optional nit: GFX_COLOR_SPACE_IMPLEMENTATION would be more self-consistent

+  if (is_mac) {
+    libs = [
+      "CoreFoundation.framework",
+      "CoreGraphics.framework",
+    ]
+  }
+  if (use_x11) {
+    deps += [ "//ui/gfx/x" ]
+    configs += [ "//build/config/linux:x11" ]
+  } else {
+    sources -= [ "icc_profile_x11.cc" ]
+  }
 }
 
 # Depend on this to use half_float.h without pulling in all of gfx.
 source_set("half_float") {
   sources = [
     "half_float.h",
   ]
 
   defines = [ "GFX_IMPLEMENTATION" ]
 
@@ skipping 92 matching lines @@
       "gpu_memory_buffer.h",
       "gpu_memory_buffer_tracing.cc",
       "gpu_memory_buffer_tracing.h",
     ]
   }
 
   defines = [ "GFX_IMPLEMENTATION" ]
 
   deps = [
     ":native_widget_types",
-    ":switches_sources",
+    ":switches",
     "//base",
     "//ui/gfx/geometry",
   ]
 
   if (is_linux) {
     sources += [
       "linux/client_native_pixmap_dmabuf.cc",
       "linux/client_native_pixmap_dmabuf.h",
       "linux/client_native_pixmap_factory_dmabuf.cc",
       "linux/client_native_pixmap_factory_dmabuf.h",
     ]
 
     deps += [ "//third_party/libdrm" ]
   }
 }
 
-source_set("switches_sources") {
-  visibility = [ ":*" ]  # Depend on through ":switches_sources".
-
+component("switches") {

[Nico, 2017/06/01 14:52:14]

Please call this gfx_switches, else this will result in libswitches.so.

[Nico, 2017/06/16 19:24:09]

I think this wasn't done.

[ccameron, 2017/06/16 19:49:27]

Oops. Fixed.

   sources = [
+    "gfx_switches_export.h",
     "switches.cc",
     "switches.h",
   ]
-
-  defines = [ "GFX_IMPLEMENTATION" ]
-
-  deps = [
-    ":gfx_export",
-    "//base",
-  ]
+  defines = [ "GFX_SWITCHES_IMPLEMENTATION" ]
 }
 
 static_library("test_support") {
   testonly = true
   sources = [
     "animation/test_animation_delegate.h",
     "geometry/test/rect_test_util.cc",
     "geometry/test/rect_test_util.h",
     "image/image_unittest_util.cc",
     "image/image_unittest_util.h",
@@ skipping 212 matching lines @@
 
 fuzzer_test("color_transform_fuzztest") {
   sources = [
     "color_transform_fuzzer.cc",
   ]
   deps = [
     ":gfx",
   ]
   libfuzzer_options = [ "max_len=1024" ]
 }