Move geometric types to a separate, more lightweight target.

ui/gfx/gfx.gyp

 # Copyright (c) 2013 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.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'targets': [
     {
+      'target_name': 'gfx_geometry',
+      'type': '<(component)',
+      'dependencies': [
+        '<(DEPTH)/base/base.gyp:base',
+      ],
+      'defines': [
+        'GFX_IMPLEMENTATION',
+      ],
+      'sources': [
+        'geometry/box_f.cc',
+        'geometry/box_f.h',
+        'geometry/insets.cc',
+        'geometry/insets.h',
+        'geometry/insets_base.h',
+        'geometry/insets_f.cc',
+        'geometry/insets_f.h',
+        'geometry/matrix3_f.cc',
+        'geometry/matrix3_f.h',
+        'geometry/point.cc',
+        'geometry/point.h',
+        'geometry/point3_f.cc',
+        'geometry/point3_f.h',
+        'geometry/point_base.h',
+        'geometry/point_conversions.cc',
+        'geometry/point_conversions.h',
+        'geometry/point_f.cc',
+        'geometry/point_f.h',
+        'geometry/quad_f.cc',
+        'geometry/quad_f.h',
+        'geometry/rect.cc',
+        'geometry/rect.h',
+        'geometry/rect_base.h',
+        'geometry/rect_base_impl.h',
+        'geometry/rect_conversions.cc',
+        'geometry/rect_conversions.h',
+        'geometry/rect_f.cc',
+        'geometry/rect_f.h',
+        'geometry/safe_integer_conversions.h',
+        'geometry/size.cc',
+        'geometry/size.h',
+        'geometry/size_base.h',
+        'geometry/size_conversions.cc',
+        'geometry/size_conversions.h',
+        'geometry/size_f.cc',
+        'geometry/size_f.h',
+        'geometry/vector2d.cc',
+        'geometry/vector2d.h',
+        'geometry/vector2d_conversions.cc',
+        'geometry/vector2d_conversions.h',
+        'geometry/vector2d_f.cc',
+        'geometry/vector2d_f.h',
+        'geometry/vector3d_f.cc',
+        'geometry/vector3d_f.h',
+      ],
+    },
+    # TODO(beng): This should either generate its own executable or be part of
+    #             a gfx_unittests executable. Currently it's built as part of
+    #             ui_unittests.
+    {
+      'target_name': 'gfx_geometry_unittests',
+      'type': 'static_library',
+      'dependencies': [
+        '<(DEPTH)/base/base.gyp:base',
+        '<(DEPTH)/base/base.gyp:test_support_base',
+        '<(DEPTH)/testing/gtest.gyp:gtest',
+        'gfx_geometry',
+      ],
+      'sources': [
+        'geometry/box_unittest.cc',
+        'geometry/insets_unittest.cc',
+        'geometry/matrix3_unittest.cc',
+        'geometry/point_unittest.cc',
+        'geometry/point3_unittest.cc',
+        'geometry/quad_unittest.cc',
+        'geometry/rect_unittest.cc',
+        'geometry/safe_integer_conversions_unittest.cc',
+        'geometry/size_unittest.cc',
+        'geometry/vector2d_unittest.cc',
+        'geometry/vector3d_unittest.cc',
+      ],
+    },
+    {
       'target_name': 'gfx',
       'type': '<(component)',
       'dependencies': [
         '<(DEPTH)/base/base.gyp:base',
         '<(DEPTH)/base/base.gyp:base_i18n',
         '<(DEPTH)/base/base.gyp:base_static',
         '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '<(DEPTH)/net/net.gyp:net',
         '<(DEPTH)/skia/skia.gyp:skia',
         '<(DEPTH)/third_party/icu/icu.gyp:icui18n',
         '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
         '<(DEPTH)/third_party/libpng/libpng.gyp:libpng',
         '<(DEPTH)/third_party/zlib/zlib.gyp:zlib',
         '<(DEPTH)/url/url.gyp:url_lib',
+        'gfx_geometry',
       ],
       # text_elider.h includes ICU headers.
       'export_dependent_settings': [
         '<(DEPTH)/skia/skia.gyp:skia',
         '<(DEPTH)/third_party/icu/icu.gyp:icui18n',
         '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
       ],
       'defines': [
         'GFX_IMPLEMENTATION',
       ],
@@ skipping 20 matching lines @@
         'animation/multi_animation.cc',
         'animation/multi_animation.h',
         'animation/slide_animation.cc',
         'animation/slide_animation.h',
         'animation/throb_animation.cc',
         'animation/throb_animation.h',
         'animation/tween.cc',
         'animation/tween.h',
         'blit.cc',
         'blit.h',
-        'box_f.cc',
-        'box_f.h',
         'break_list.h',
         'canvas.cc',
         'canvas.h',
         'canvas_android.cc',
         'canvas_paint_gtk.cc',
         'canvas_paint_gtk.h',
         'canvas_paint_mac.h',
         'canvas_paint_mac.mm',
         'canvas_paint_win.cc',
         'canvas_paint_win.h',
@@ skipping 51 matching lines @@
         'image/image_skia_rep.cc',
         'image/image_skia_rep.h',
         'image/image_skia_source.h',
         'image/image_skia_util_ios.h',
         'image/image_skia_util_ios.mm',
         'image/image_skia_util_mac.h',
         'image/image_skia_util_mac.mm',
         'image/image_util.cc',
         'image/image_util.h',
         'image/image_util_ios.mm',
-        'insets.cc',
-        'insets.h',
-        'insets_base.h',
-        'insets_f.cc',
-        'insets_f.h',
         'interpolated_transform.cc',
         'interpolated_transform.h',
         'mac/scoped_ns_disable_screen_updates.h',
-        'matrix3_f.cc',
-        'matrix3_f.h',
         'native_widget_types.h',
         'ozone/dri/dri_skbitmap.cc',
         'ozone/dri/dri_skbitmap.h',
         'ozone/dri/dri_surface.cc',
         'ozone/dri/dri_surface.h',
         'ozone/dri/dri_surface_factory.cc',
         'ozone/dri/dri_surface_factory.h',
         'ozone/dri/dri_vsync_provider.cc',
         'ozone/dri/dri_vsync_provider.h',
         'ozone/dri/dri_wrapper.cc',
@@ skipping 18 matching lines @@
         'platform_font_android.cc',
         'platform_font_ios.h',
         'platform_font_ios.mm',
         'platform_font_mac.h',
         'platform_font_mac.mm',
         'platform_font_ozone.cc',
         'platform_font_pango.cc',
         'platform_font_pango.h',
         'platform_font_win.cc',
         'platform_font_win.h',
-        'point.cc',
-        'point.h',
-        'point3_f.cc',
-        'point3_f.h',
-        'point_base.h',
-        'point_conversions.cc',
-        'point_conversions.h',
-        'point_f.cc',
-        'point_f.h',
-        'quad_f.cc',
-        'quad_f.h',
         'range/range.cc',
         'range/range.h',
         'range/range_mac.mm',
         'range/range_win.cc',
-        'rect.cc',
-        'rect.h',
-        'rect_base.h',
-        'rect_base_impl.h',
-        'rect_conversions.cc',
-        'rect_conversions.h',
-        'rect_f.cc',
-        'rect_f.h',
         'render_text.cc',
         'render_text.h',
         'render_text_mac.cc',
         'render_text_mac.h',
         'render_text_ozone.cc',
         'render_text_pango.cc',
         'render_text_pango.h',
         'render_text_win.cc',
         'render_text_win.h',
-        'safe_integer_conversions.h',
         'scoped_canvas.h',
         'scoped_cg_context_save_gstate_mac.h',
         'scoped_ns_graphics_context_save_gstate_mac.h',
         'scoped_ns_graphics_context_save_gstate_mac.mm',
         'scoped_ui_graphics_push_context_ios.h',
         'scoped_ui_graphics_push_context_ios.mm',
         'screen.cc',
         'screen.h',
         'screen_android.cc',
         'screen_aura.cc',
         'screen_gtk.cc',
         'screen_ios.mm',
         'screen_mac.mm',
         'screen_win.cc',
         'screen_win.h',
         'scrollbar_size.cc',
         'scrollbar_size.h',
         'selection_model.cc',
         'selection_model.h',
         'sequential_id_generator.cc',
         'sequential_id_generator.h',
         'shadow_value.cc',
         'shadow_value.h',
-        'size.cc',
-        'size.h',
-        'size_base.h',
-        'size_conversions.cc',
-        'size_conversions.h',
-        'size_f.cc',
-        'size_f.h',
         'skbitmap_operations.cc',
         'skbitmap_operations.h',
         'skia_util.cc',
         'skia_util.h',
         'skia_utils_gtk.cc',
         'skia_utils_gtk.h',
         'switches.cc',
         'switches.h',
         'sys_color_change_listener.cc',
         'sys_color_change_listener.h',
         'text_constants.h',
         'text_elider.cc',
         'text_elider.h',
         'text_utils.cc',
         'text_utils.h',
         'text_utils_android.cc',
         'text_utils_ios.mm',
         'text_utils_skia.cc',
         'transform.cc',
         'transform.h',
         'transform_util.cc',
         'transform_util.h',
         'ui_gfx_exports.cc',
         'utf16_indexing.cc',
         'utf16_indexing.h',
-        'vector2d.cc',
-        'vector2d.h',
-        'vector2d_conversions.cc',
-        'vector2d_conversions.h',
-        'vector2d_f.cc',
-        'vector2d_f.h',
-        'vector3d_f.cc',
-        'vector3d_f.h',
         'vsync_provider.h',
         'win/dpi.cc',
         'win/dpi.h',
         'win/hwnd_util.cc',
         'win/hwnd_util.h',
         'win/scoped_set_map_mode.h',
         'win/singleton_hwnd.cc',
         'win/singleton_hwnd.h',
         'win/window_impl.cc',
         'win/window_impl.h',
@@ skipping 134 matching lines @@
          'variables': {
            'jni_gen_package': 'ui/gfx',
            'jni_generator_ptr_type': 'long'
          },
          'includes': [ '../../build/jni_generator.gypi' ],
        },
      ],
     }],
   ],
 }