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_export.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",
   ]
   public_deps = [
-    ":gfx_export",
+    ":switches",
     "//base",
     "//skia",
   ]
-  deps = [
-    ":switches_sources",
-    "//base",
-    "//skia",
-  ]
-  defines = [ "GFX_IMPLEMENTATION" ]
+  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" ]
+  }
+  defines = [ "COLOR_SPACE_IMPLEMENTATION" ]
 }
 
 # 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".
-
+# TODO(ccameron): This should not be a separate component. This may be removed
+# once color correct rendering is enabled.

[ccameron, 2017/06/15 21:30:46]

This exists for two reasons
1. The "enable color correction" switch needs to be accessed in all sorts of
strange places because of interactions with IOSurface color spaces that crept in
to macOS 10.12. Once this flag is "on by default", those workarounds will be
removed.
2. Monitor information is queried using the "ICCProfile::FromBestMonitor"
function, which queries the "headless" attribute. Once the color correct
rendering flag is "on by default", we will be able to remove the
"ICCProfile::FromBestMonitor" function (since it currently provides the color
for image decode in Blink, which will go away).

Given this tangle, I think that making switches be a separate component for now
makes the most sense.

After color correct rendering can't be turned off, color_space_switches will be
moved into the color_space target (which can't be done because of skia-exclusion
by nacl right now), and switches can be moved back to being a source_set.

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

Can you add some of this to the comment?

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

Done.

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