Index: ui/gfx/gfx.gyp |
diff --git a/ui/gfx/gfx.gyp b/ui/gfx/gfx.gyp |
index ed5368a6b18a7801a932c783c32135704e1b1810..075e38fb007c1c855dde4bc90473080d8941b53b 100644 |
--- a/ui/gfx/gfx.gyp |
+++ b/ui/gfx/gfx.gyp |
@@ -8,6 +8,88 @@ |
}, |
'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': [ |
@@ -22,6 +104,7 @@ |
'<(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': [ |
@@ -62,8 +145,6 @@ |
'animation/tween.h', |
'blit.cc', |
'blit.h', |
- 'box_f.cc', |
- 'box_f.h', |
'break_list.h', |
'canvas.cc', |
'canvas.h', |
@@ -135,16 +216,9 @@ |
'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', |
@@ -183,29 +257,10 @@ |
'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', |
@@ -215,7 +270,6 @@ |
'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', |
@@ -239,13 +293,6 @@ |
'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', |
@@ -271,14 +318,6 @@ |
'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', |