summaryrefslogtreecommitdiffstats
path: root/cc/cc.gyp
diff options
context:
space:
mode:
authorloyso <loyso@chromium.org>2016-02-23 18:59:42 -0800
committerCommit bot <commit-bot@chromium.org>2016-02-24 03:02:04 +0000
commit455b4f607405393fb2f2231cf34b87efee527356 (patch)
treebeca22167affa99ad9bfe6117b40ee5f7a739f39 /cc/cc.gyp
parentb50b8e5961af7d8cd3c3b48de4e91689206fc377 (diff)
downloadchromium_src-455b4f607405393fb2f2231cf34b87efee527356.zip
chromium_src-455b4f607405393fb2f2231cf34b87efee527356.tar.gz
chromium_src-455b4f607405393fb2f2231cf34b87efee527356.tar.bz2
CC Animation: Move scrollbar* files to cc/input
BUG=575053 CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel Review URL: https://codereview.chromium.org/1730853002 Cr-Commit-Position: refs/heads/master@{#377200}
Diffstat (limited to 'cc/cc.gyp')
-rw-r--r--cc/cc.gyp23
1 files changed, 11 insertions, 12 deletions
diff --git a/cc/cc.gyp b/cc/cc.gyp
index 8eba025..22c01e2 100644
--- a/cc/cc.gyp
+++ b/cc/cc.gyp
@@ -63,12 +63,6 @@
'animation/layer_animation_value_provider.h',
'animation/scroll_offset_animation_curve.cc',
'animation/scroll_offset_animation_curve.h',
- 'animation/scrollbar_animation_controller.cc',
- 'animation/scrollbar_animation_controller.h',
- 'animation/scrollbar_animation_controller_linear_fade.cc',
- 'animation/scrollbar_animation_controller_linear_fade.h',
- 'animation/scrollbar_animation_controller_thinning.cc',
- 'animation/scrollbar_animation_controller_thinning.h',
'animation/timing_function.cc',
'animation/timing_function.h',
'animation/transform_operation.cc',
@@ -168,8 +162,14 @@
'input/scroll_state.h',
'input/scroll_state_data.cc',
'input/scroll_state_data.h',
- 'input/selection_bound_type.h',
+ 'input/scrollbar_animation_controller.cc',
+ 'input/scrollbar_animation_controller.h',
+ 'input/scrollbar_animation_controller_linear_fade.cc',
+ 'input/scrollbar_animation_controller_linear_fade.h',
+ 'input/scrollbar_animation_controller_thinning.cc',
+ 'input/scrollbar_animation_controller_thinning.h',
'input/selection.h',
+ 'input/selection_bound_type.h',
'input/top_controls_manager.cc',
'input/top_controls_manager.h',
'input/top_controls_manager_client.h',
@@ -426,7 +426,6 @@
'raster/one_copy_tile_task_worker_pool.h',
'raster/raster_buffer.cc',
'raster/raster_buffer.h',
- 'raster/task_category.h',
'raster/scoped_gpu_raster.cc',
'raster/scoped_gpu_raster.h',
'raster/single_thread_task_graph_runner.cc',
@@ -570,10 +569,10 @@
'trees/proxy_impl.h',
'trees/proxy_main.cc',
'trees/proxy_main.h',
- 'trees/remote_channel_impl.cc',
- 'trees/remote_channel_impl.h',
- 'trees/remote_channel_main.cc',
- 'trees/remote_channel_main.h',
+ 'trees/remote_channel_impl.cc',
+ 'trees/remote_channel_impl.h',
+ 'trees/remote_channel_main.cc',
+ 'trees/remote_channel_main.h',
'trees/remote_proto_channel.h',
'trees/scoped_abort_remaining_swap_promises.h',
'trees/single_thread_proxy.cc',