Bring up of ui/base/animation on iOS.

Include all the animation files used on iOS. Plus their associated tests. This
CL also adds the layout tests that were missing.

BUG=None


Review URL: https://chromiumcodereview.appspot.com/11049029

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@160117 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 33 insertions, 34 deletions

diff --git a/ui/ui.gyp b/ui/ui.gyp
index a7ab912..0fee119 100644
--- a/ui/ui.gyp
+++ b/ui/ui.gyp
@@ -41,6 +41,21 @@
       # iOS uses a small subset of ui. common_sources are the only files that
       # are built on iOS.
       'common_sources' : [
+        'base/animation/animation.cc',
+        'base/animation/animation.h',
+        'base/animation/animation_container.cc',
+        'base/animation/animation_container.h',
+        'base/animation/animation_container_element.h',
+        'base/animation/animation_container_observer.h',
+        'base/animation/animation_delegate.h',
+        'base/animation/linear_animation.cc',
+        'base/animation/linear_animation.h',
+        'base/animation/multi_animation.cc',
+        'base/animation/multi_animation.h',
+        'base/animation/slide_animation.cc',
+        'base/animation/slide_animation.h',
+        'base/animation/tween.cc',
+        'base/animation/tween.h',
         'base/layout.cc',
         'base/layout.h',
         'base/models/tree_node_iterator.h',
@@ -73,6 +88,8 @@
         'gfx/image/image_util_ios.mm',
         'gfx/insets.cc',
         'gfx/insets.h',
+        'gfx/interpolated_transform.h',
+        'gfx/interpolated_transform.cc',
         'gfx/point.cc',
         'gfx/point.h',
         'gfx/point_base.h',
@@ -99,11 +116,19 @@
         'gfx/screen_ios.mm',
         'gfx/screen_mac.mm',
         'gfx/screen_win.cc',
+        'gfx/shadow_value.cc',
+        'gfx/shadow_value.h',
         'gfx/size.cc',
         'gfx/size.h',
         'gfx/size_base.h',
         'gfx/size_f.cc',
         'gfx/size_f.h',
+        'gfx/skia_util.cc',
+        'gfx/skia_util.h',
+        'gfx/skia_utils_gtk.cc',
+        'gfx/skia_utils_gtk.h',
+        'gfx/transform.cc',
+        'gfx/transform.h',
       ],
       'all_sources': [
         '<@(_common_sources)',
@@ -122,23 +147,8 @@
         'base/accessibility/accessible_text_utils.h',
         'base/accessibility/accessible_view_state.cc',
         'base/accessibility/accessible_view_state.h',
-        'base/animation/animation.cc',
-        'base/animation/animation.h',
-        'base/animation/animation_container.cc',
-        'base/animation/animation_container.h',
-        'base/animation/animation_container_element.h',
-        'base/animation/animation_container_observer.h',
-        'base/animation/animation_delegate.h',
-        'base/animation/linear_animation.cc',
-        'base/animation/linear_animation.h',
-        'base/animation/multi_animation.cc',
-        'base/animation/multi_animation.h',
-        'base/animation/slide_animation.cc',
-        'base/animation/slide_animation.h',
         'base/animation/throb_animation.cc',
         'base/animation/throb_animation.h',
-        'base/animation/tween.cc',
-        'base/animation/tween.h',
         'base/clipboard/clipboard.cc',
         'base/clipboard/clipboard.h',
         'base/clipboard/clipboard_android.cc',
@@ -457,8 +467,6 @@
         'gfx/gfx_paths.h',
         'gfx/image/canvas_image_source.cc',
         'gfx/image/canvas_image_source.h',
-        'gfx/interpolated_transform.h',
-        'gfx/interpolated_transform.cc',
         'gfx/mac/nsimage_cache.h',
         'gfx/mac/nsimage_cache.mm',
         'gfx/mac/scoped_ns_disable_screen_updates.h',
@@ -496,19 +504,11 @@
         'gfx/scrollbar_size.h',
         'gfx/selection_model.cc',
         'gfx/selection_model.h',
-        'gfx/shadow_value.cc',
-        'gfx/shadow_value.h',
         'gfx/skbitmap_operations.cc',
         'gfx/skbitmap_operations.h',
-        'gfx/skia_util.cc',
-        'gfx/skia_util.h',
-        'gfx/skia_utils_gtk.cc',
-        'gfx/skia_utils_gtk.h',
         'gfx/sys_color_change_listener.cc',
         'gfx/sys_color_change_listener.h',
         'gfx/text_constants.h',
-        'gfx/transform.cc',
-        'gfx/transform.h',
         'gfx/transform_util.cc',
         'gfx/transform_util.h',
         'gfx/video_decode_acceleration_support_mac.h',
diff --git a/ui/ui_unittests.gypi b/ui/ui_unittests.gypi
index 367a759..73f2d1a 100644
--- a/ui/ui_unittests.gypi
+++ b/ui/ui_unittests.gypi
@@ -60,6 +60,11 @@
       # iOS uses a small subset of ui. common_sources are the only files that
       # are built on iOS.
       'common_sources' : [
+        'base/animation/animation_container_unittest.cc',
+        'base/animation/animation_unittest.cc',
+        'base/animation/multi_animation_unittest.cc',
+        'base/animation/slide_animation_unittest.cc',
+        'base/layout_unittest.cc',
         'base/models/tree_node_iterator_unittest.cc',
         'gfx/image/image_skia_unittest.cc',
         'gfx/image/image_unittest.cc',
@@ -68,14 +73,13 @@
         'gfx/image/image_unittest_util_ios.mm',
         'gfx/image/image_unittest_util_mac.mm',
         'gfx/insets_unittest.cc',
+        'gfx/rect_unittest.cc',
+        'gfx/shadow_value_unittest.cc',
+        'gfx/skia_util_unittest.cc',
       ],
       'all_sources': [
         '<@(_common_sources)',
         'base/accelerators/accelerator_manager_unittest.cc',
-        'base/animation/animation_container_unittest.cc',
-        'base/animation/animation_unittest.cc',
-        'base/animation/multi_animation_unittest.cc',
-        'base/animation/slide_animation_unittest.cc',
         'base/clipboard/clipboard_unittest.cc',
         'base/clipboard/custom_data_helper_unittest.cc',
         'base/cocoa/base_view_unittest.mm',
@@ -88,11 +92,9 @@
         'base/gtk/gtk_expanded_container_unittest.cc',
         'base/gtk/gtk_im_context_util_unittest.cc',
         'base/gtk/menu_label_accelerator_util_unittest.cc',
-        'base/layout_unittest.cc',
         'base/l10n/l10n_util_mac_unittest.mm',
         'base/l10n/l10n_util_unittest.cc',
         'base/models/list_model_unittest.cc',
-        'base/models/tree_node_iterator_unittest.cc',
         'base/models/tree_node_model_unittest.cc',
         'base/range/range_unittest.cc',
         'base/range/range_mac_unittest.mm',
@@ -117,12 +119,9 @@
         'gfx/platform_font_mac_unittest.mm',
         'gfx/image/image_mac_unittest.mm',
         'gfx/image/image_util_unittest.cc',
-        'gfx/rect_unittest.cc',
         'gfx/render_text_unittest.cc',
         'gfx/screen_unittest.cc',
-        'gfx/shadow_value_unittest.cc',
         'gfx/skbitmap_operations_unittest.cc',
-        'gfx/skia_util_unittest.cc',
         'gfx/transform_util_unittest.cc',
         'gfx/video_decode_acceleration_support_mac_unittest.mm',
         'test/run_all_unittests.cc',