diff options
| author | heejin.r.chung <heejin.r.chung@samsung.com> | 2014-10-23 09:36:20 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-23 16:36:44 +0000 |
| commit | d28506ba1497a3f5fa5b9f6702892cb1cb58ea15 (patch) | |
| tree | 94f6bc3ab76eb146d4414d2e9f6821c0025ced5c /cc | |
| parent | 8d00df06667a84206db7b750aba89e0e7cb8a737 (diff) | |
| download | chromium_src-d28506ba1497a3f5fa5b9f6702892cb1cb58ea15.zip chromium_src-d28506ba1497a3f5fa5b9f6702892cb1cb58ea15.tar.gz chromium_src-d28506ba1497a3f5fa5b9f6702892cb1cb58ea15.tar.bz2 | |
cc cleanup: Update paths to geometry headers
Geometry headers were moved from /ui/gfx/ to ui/gfx/geometry.
Updating includes accordingly.
BUG=395370
Review URL: https://codereview.chromium.org/660333004
Cr-Commit-Position: refs/heads/master@{#300902}
Diffstat (limited to 'cc')
157 files changed, 230 insertions, 257 deletions
diff --git a/cc/animation/keyframed_animation_curve.cc b/cc/animation/keyframed_animation_curve.cc index de18a2b..333a5c9 100644 --- a/cc/animation/keyframed_animation_curve.cc +++ b/cc/animation/keyframed_animation_curve.cc @@ -6,7 +6,7 @@ #include "cc/animation/keyframed_animation_curve.h" #include "ui/gfx/animation/tween.h" -#include "ui/gfx/box_f.h" +#include "ui/gfx/geometry/box_f.h" namespace cc { diff --git a/cc/animation/keyframed_animation_curve_unittest.cc b/cc/animation/keyframed_animation_curve_unittest.cc index 32bc141..71fd521 100644 --- a/cc/animation/keyframed_animation_curve_unittest.cc +++ b/cc/animation/keyframed_animation_curve_unittest.cc @@ -8,7 +8,7 @@ #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/gfx/animation/tween.h" -#include "ui/gfx/box_f.h" +#include "ui/gfx/geometry/box_f.h" #include "ui/gfx/test/gfx_util.h" namespace cc { diff --git a/cc/animation/layer_animation_controller.cc b/cc/animation/layer_animation_controller.cc index ab6db10..b779a37 100644 --- a/cc/animation/layer_animation_controller.cc +++ b/cc/animation/layer_animation_controller.cc @@ -16,7 +16,7 @@ #include "cc/animation/scroll_offset_animation_curve.h" #include "cc/base/scoped_ptr_algorithm.h" #include "cc/output/filter_operations.h" -#include "ui/gfx/box_f.h" +#include "ui/gfx/geometry/box_f.h" #include "ui/gfx/transform.h" namespace cc { diff --git a/cc/animation/layer_animation_controller_unittest.cc b/cc/animation/layer_animation_controller_unittest.cc index 96c406c..49ac0a5 100644 --- a/cc/animation/layer_animation_controller_unittest.cc +++ b/cc/animation/layer_animation_controller_unittest.cc @@ -14,7 +14,7 @@ #include "cc/test/animation_test_common.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" -#include "ui/gfx/box_f.h" +#include "ui/gfx/geometry/box_f.h" #include "ui/gfx/transform.h" namespace cc { diff --git a/cc/animation/scrollbar_animation_controller.h b/cc/animation/scrollbar_animation_controller.h index 8c98c9e..92efe75 100644 --- a/cc/animation/scrollbar_animation_controller.h +++ b/cc/animation/scrollbar_animation_controller.h @@ -9,7 +9,7 @@ #include "base/memory/weak_ptr.h" #include "base/time/time.h" #include "cc/base/cc_export.h" -#include "ui/gfx/vector2d_f.h" +#include "ui/gfx/geometry/vector2d_f.h" namespace cc { diff --git a/cc/animation/transform_operation.cc b/cc/animation/transform_operation.cc index a24b8a7..e9ae86d 100644 --- a/cc/animation/transform_operation.cc +++ b/cc/animation/transform_operation.cc @@ -14,7 +14,7 @@ #include "base/logging.h" #include "cc/animation/transform_operation.h" #include "cc/animation/transform_operations.h" -#include "ui/gfx/box_f.h" +#include "ui/gfx/geometry/box_f.h" #include "ui/gfx/geometry/vector3d_f.h" #include "ui/gfx/transform_util.h" diff --git a/cc/animation/transform_operations.cc b/cc/animation/transform_operations.cc index 79a68f8..7bc4ce2 100644 --- a/cc/animation/transform_operations.cc +++ b/cc/animation/transform_operations.cc @@ -7,7 +7,7 @@ #include <algorithm> #include "ui/gfx/animation/tween.h" -#include "ui/gfx/box_f.h" +#include "ui/gfx/geometry/box_f.h" #include "ui/gfx/geometry/vector3d_f.h" #include "ui/gfx/transform_util.h" diff --git a/cc/animation/transform_operations_unittest.cc b/cc/animation/transform_operations_unittest.cc index ce10cf3..7aae696 100644 --- a/cc/animation/transform_operations_unittest.cc +++ b/cc/animation/transform_operations_unittest.cc @@ -10,9 +10,9 @@ #include "cc/test/geometry_test_utils.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/gfx/animation/tween.h" -#include "ui/gfx/box_f.h" +#include "ui/gfx/geometry/box_f.h" +#include "ui/gfx/geometry/rect_conversions.h" #include "ui/gfx/geometry/vector3d_f.h" -#include "ui/gfx/rect_conversions.h" namespace cc { namespace { diff --git a/cc/base/float_quad_unittest.cc b/cc/base/float_quad_unittest.cc index c2186fd81..6d9ce02 100644 --- a/cc/base/float_quad_unittest.cc +++ b/cc/base/float_quad_unittest.cc @@ -4,8 +4,8 @@ #include "cc/base/math_util.h" #include "testing/gtest/include/gtest/gtest.h" -#include "ui/gfx/quad_f.h" -#include "ui/gfx/rect_f.h" +#include "ui/gfx/geometry/quad_f.h" +#include "ui/gfx/geometry/rect_f.h" #include "ui/gfx/transform.h" namespace cc { diff --git a/cc/base/invalidation_region.h b/cc/base/invalidation_region.h index 9cb2fe3..7aa4a8b 100644 --- a/cc/base/invalidation_region.h +++ b/cc/base/invalidation_region.h @@ -7,7 +7,7 @@ #include "cc/base/cc_export.h" #include "cc/base/region.h" -#include "ui/gfx/rect.h" +#include "ui/gfx/geometry/rect.h" namespace cc { diff --git a/cc/base/math_util.cc b/cc/base/math_util.cc index 8cd0692..816f6fc 100644 --- a/cc/base/math_util.cc +++ b/cc/base/math_util.cc @@ -10,12 +10,12 @@ #include "base/debug/trace_event_argument.h" #include "base/values.h" -#include "ui/gfx/quad_f.h" -#include "ui/gfx/rect.h" -#include "ui/gfx/rect_conversions.h" -#include "ui/gfx/rect_f.h" +#include "ui/gfx/geometry/quad_f.h" +#include "ui/gfx/geometry/rect.h" +#include "ui/gfx/geometry/rect_conversions.h" +#include "ui/gfx/geometry/rect_f.h" +#include "ui/gfx/geometry/vector2d_f.h" #include "ui/gfx/transform.h" -#include "ui/gfx/vector2d_f.h" namespace cc { diff --git a/cc/base/math_util.h b/cc/base/math_util.h index 622ea4d..50494e1 100644 --- a/cc/base/math_util.h +++ b/cc/base/math_util.h @@ -12,11 +12,11 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "cc/base/cc_export.h" -#include "ui/gfx/box_f.h" +#include "ui/gfx/geometry/box_f.h" +#include "ui/gfx/geometry/point3_f.h" +#include "ui/gfx/geometry/point_f.h" #include "ui/gfx/geometry/scroll_offset.h" -#include "ui/gfx/point3_f.h" -#include "ui/gfx/point_f.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #include "ui/gfx/transform.h" namespace base { diff --git a/cc/base/math_util_unittest.cc b/cc/base/math_util_unittest.cc index fb8c27f..325870d 100644 --- a/cc/base/math_util_unittest.cc +++ b/cc/base/math_util_unittest.cc @@ -9,8 +9,8 @@ #include "cc/test/geometry_test_utils.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" -#include "ui/gfx/rect.h" -#include "ui/gfx/rect_f.h" +#include "ui/gfx/geometry/rect.h" +#include "ui/gfx/geometry/rect_f.h" #include "ui/gfx/transform.h" namespace cc { diff --git a/cc/base/region.h b/cc/base/region.h index d78d4cb..294ea63 100644 --- a/cc/base/region.h +++ b/cc/base/region.h @@ -10,7 +10,7 @@ #include "base/memory/scoped_ptr.h" #include "cc/base/cc_export.h" #include "third_party/skia/include/core/SkRegion.h" -#include "ui/gfx/rect.h" +#include "ui/gfx/geometry/rect.h" #include "ui/gfx/skia_util.h" namespace base { diff --git a/cc/base/simple_enclosed_region.h b/cc/base/simple_enclosed_region.h index c9625ba..5e8a6b2 100644 --- a/cc/base/simple_enclosed_region.h +++ b/cc/base/simple_enclosed_region.h @@ -8,7 +8,7 @@ #include <string> #include "cc/base/cc_export.h" -#include "ui/gfx/rect.h" +#include "ui/gfx/geometry/rect.h" namespace cc { diff --git a/cc/base/tiling_data.cc b/cc/base/tiling_data.cc index 61bb851..7b39878 100644 --- a/cc/base/tiling_data.cc +++ b/cc/base/tiling_data.cc @@ -6,8 +6,8 @@ #include <algorithm> -#include "ui/gfx/rect.h" -#include "ui/gfx/vector2d.h" +#include "ui/gfx/geometry/rect.h" +#include "ui/gfx/geometry/vector2d.h" namespace cc { diff --git a/cc/base/tiling_data.h b/cc/base/tiling_data.h index 08d421c..5e8a4d6 100644 --- a/cc/base/tiling_data.h +++ b/cc/base/tiling_data.h @@ -10,8 +10,8 @@ #include "base/basictypes.h" #include "base/logging.h" #include "cc/base/cc_export.h" -#include "ui/gfx/rect.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/rect.h" +#include "ui/gfx/geometry/size.h" namespace gfx { class Vector2d; diff --git a/cc/blink/web_layer_impl_fixed_bounds.h b/cc/blink/web_layer_impl_fixed_bounds.h index 907975a..099feaf 100644 --- a/cc/blink/web_layer_impl_fixed_bounds.h +++ b/cc/blink/web_layer_impl_fixed_bounds.h @@ -6,7 +6,7 @@ #define CC_BLINK_WEB_LAYER_IMPL_FIXED_BOUNDS_H_ #include "cc/blink/web_layer_impl.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #include "ui/gfx/transform.h" namespace cc_blink { diff --git a/cc/blink/web_layer_impl_fixed_bounds_unittest.cc b/cc/blink/web_layer_impl_fixed_bounds_unittest.cc index f439366..ceeb311 100644 --- a/cc/blink/web_layer_impl_fixed_bounds_unittest.cc +++ b/cc/blink/web_layer_impl_fixed_bounds_unittest.cc @@ -12,7 +12,7 @@ #include "third_party/WebKit/public/platform/WebFloatPoint.h" #include "third_party/WebKit/public/platform/WebSize.h" #include "third_party/skia/include/utils/SkMatrix44.h" -#include "ui/gfx/point3_f.h" +#include "ui/gfx/geometry/point3_f.h" using blink::WebFloatPoint; using blink::WebSize; diff --git a/cc/debug/debug_rect_history.h b/cc/debug/debug_rect_history.h index 278b208..6d25b29 100644 --- a/cc/debug/debug_rect_history.h +++ b/cc/debug/debug_rect_history.h @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" #include "cc/layers/layer_lists.h" -#include "ui/gfx/rect.h" +#include "ui/gfx/geometry/rect.h" namespace cc { diff --git a/cc/debug/invalidation_benchmark.cc b/cc/debug/invalidation_benchmark.cc index 87d2edd..1a6a2b8 100644 --- a/cc/debug/invalidation_benchmark.cc +++ b/cc/debug/invalidation_benchmark.cc @@ -14,7 +14,7 @@ #include "cc/layers/picture_layer.h" #include "cc/trees/layer_tree_host.h" #include "cc/trees/layer_tree_host_common.h" -#include "ui/gfx/rect.h" +#include "ui/gfx/geometry/rect.h" namespace cc { diff --git a/cc/debug/picture_record_benchmark.cc b/cc/debug/picture_record_benchmark.cc index a8a296d..5f832ae 100644 --- a/cc/debug/picture_record_benchmark.cc +++ b/cc/debug/picture_record_benchmark.cc @@ -12,7 +12,7 @@ #include "cc/layers/picture_layer.h" #include "cc/trees/layer_tree_host.h" #include "cc/trees/layer_tree_host_common.h" -#include "ui/gfx/rect.h" +#include "ui/gfx/geometry/rect.h" namespace cc { diff --git a/cc/debug/rasterize_and_record_benchmark.cc b/cc/debug/rasterize_and_record_benchmark.cc index 7a1319d..f24dce3 100644 --- a/cc/debug/rasterize_and_record_benchmark.cc +++ b/cc/debug/rasterize_and_record_benchmark.cc @@ -17,7 +17,7 @@ #include "cc/layers/picture_layer.h" #include "cc/trees/layer_tree_host.h" #include "cc/trees/layer_tree_host_common.h" -#include "ui/gfx/rect.h" +#include "ui/gfx/geometry/rect.h" namespace cc { diff --git a/cc/debug/rasterize_and_record_benchmark_impl.cc b/cc/debug/rasterize_and_record_benchmark_impl.cc index 57e7f15..612dad8 100644 --- a/cc/debug/rasterize_and_record_benchmark_impl.cc +++ b/cc/debug/rasterize_and_record_benchmark_impl.cc @@ -15,7 +15,7 @@ #include "cc/resources/raster_worker_pool.h" #include "cc/trees/layer_tree_host_common.h" #include "cc/trees/layer_tree_host_impl.h" -#include "ui/gfx/rect.h" +#include "ui/gfx/geometry/rect.h" namespace cc { diff --git a/cc/input/layer_scroll_offset_delegate.h b/cc/input/layer_scroll_offset_delegate.h index f7ca485..02ba011 100644 --- a/cc/input/layer_scroll_offset_delegate.h +++ b/cc/input/layer_scroll_offset_delegate.h @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "ui/gfx/geometry/scroll_offset.h" -#include "ui/gfx/size_f.h" +#include "ui/gfx/geometry/size_f.h" namespace cc { diff --git a/cc/input/page_scale_animation.cc b/cc/input/page_scale_animation.cc index 23bf21b..111502b 100644 --- a/cc/input/page_scale_animation.cc +++ b/cc/input/page_scale_animation.cc @@ -8,9 +8,9 @@ #include "base/logging.h" #include "cc/animation/timing_function.h" -#include "ui/gfx/point_f.h" -#include "ui/gfx/rect_f.h" -#include "ui/gfx/vector2d_conversions.h" +#include "ui/gfx/geometry/point_f.h" +#include "ui/gfx/geometry/rect_f.h" +#include "ui/gfx/geometry/vector2d_conversions.h" namespace { diff --git a/cc/input/page_scale_animation.h b/cc/input/page_scale_animation.h index fca9563..ce13dcf 100644 --- a/cc/input/page_scale_animation.h +++ b/cc/input/page_scale_animation.h @@ -9,8 +9,8 @@ #include "base/memory/scoped_ptr.h" #include "base/time/time.h" #include "cc/base/cc_export.h" -#include "ui/gfx/size.h" -#include "ui/gfx/vector2d_f.h" +#include "ui/gfx/geometry/size.h" +#include "ui/gfx/geometry/vector2d_f.h" namespace cc { diff --git a/cc/input/scrollbar.h b/cc/input/scrollbar.h index 8321ae2..19ac92a 100644 --- a/cc/input/scrollbar.h +++ b/cc/input/scrollbar.h @@ -6,8 +6,8 @@ #define CC_INPUT_SCROLLBAR_H_ #include "cc/base/cc_export.h" -#include "ui/gfx/point.h" -#include "ui/gfx/rect.h" +#include "ui/gfx/geometry/point.h" +#include "ui/gfx/geometry/rect.h" class SkCanvas; diff --git a/cc/input/top_controls_manager.cc b/cc/input/top_controls_manager.cc index 18a93a5..cd3534c 100644 --- a/cc/input/top_controls_manager.cc +++ b/cc/input/top_controls_manager.cc @@ -13,8 +13,8 @@ #include "cc/output/begin_frame_args.h" #include "cc/trees/layer_tree_impl.h" #include "ui/gfx/frame_time.h" +#include "ui/gfx/geometry/vector2d_f.h" #include "ui/gfx/transform.h" -#include "ui/gfx/vector2d_f.h" namespace cc { namespace { diff --git a/cc/input/top_controls_manager.h b/cc/input/top_controls_manager.h index 1aface8..a90d33d 100644 --- a/cc/input/top_controls_manager.h +++ b/cc/input/top_controls_manager.h @@ -9,8 +9,8 @@ #include "base/memory/weak_ptr.h" #include "cc/input/top_controls_state.h" #include "cc/layers/layer_impl.h" -#include "ui/gfx/size.h" -#include "ui/gfx/vector2d_f.h" +#include "ui/gfx/geometry/size.h" +#include "ui/gfx/geometry/vector2d_f.h" namespace base { class TimeTicks; diff --git a/cc/input/top_controls_manager_unittest.cc b/cc/input/top_controls_manager_unittest.cc index 9bde132..77b40c9 100644 --- a/cc/input/top_controls_manager_unittest.cc +++ b/cc/input/top_controls_manager_unittest.cc @@ -14,7 +14,7 @@ #include "cc/trees/layer_tree_impl.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/gfx/frame_time.h" -#include "ui/gfx/vector2d_f.h" +#include "ui/gfx/geometry/vector2d_f.h" namespace cc { namespace { diff --git a/cc/layers/contents_scaling_layer.cc b/cc/layers/contents_scaling_layer.cc index 5811bdc..733bac0 100644 --- a/cc/layers/contents_scaling_layer.cc +++ b/cc/layers/contents_scaling_layer.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "cc/layers/contents_scaling_layer.h" -#include "ui/gfx/size_conversions.h" +#include "ui/gfx/geometry/size_conversions.h" namespace cc { diff --git a/cc/layers/delegated_frame_provider.h b/cc/layers/delegated_frame_provider.h index b71c748..3bcf9195 100644 --- a/cc/layers/delegated_frame_provider.h +++ b/cc/layers/delegated_frame_provider.h @@ -12,8 +12,8 @@ #include "cc/base/cc_export.h" #include "cc/resources/return_callback.h" #include "cc/resources/returned_resource.h" -#include "ui/gfx/rect_f.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/rect_f.h" +#include "ui/gfx/geometry/size.h" namespace cc { class DelegatedFrameData; diff --git a/cc/layers/draw_properties.h b/cc/layers/draw_properties.h index 23845a0..403393e 100644 --- a/cc/layers/draw_properties.h +++ b/cc/layers/draw_properties.h @@ -6,7 +6,7 @@ #define CC_LAYERS_DRAW_PROPERTIES_H_ #include "base/memory/scoped_ptr.h" -#include "ui/gfx/rect.h" +#include "ui/gfx/geometry/rect.h" #include "ui/gfx/transform.h" namespace cc { diff --git a/cc/layers/heads_up_display_layer_impl.cc b/cc/layers/heads_up_display_layer_impl.cc index 1dbdc64..0692139 100644 --- a/cc/layers/heads_up_display_layer_impl.cc +++ b/cc/layers/heads_up_display_layer_impl.cc @@ -25,8 +25,8 @@ #include "third_party/skia/include/core/SkPaint.h" #include "third_party/skia/include/core/SkTypeface.h" #include "third_party/skia/include/effects/SkColorMatrixFilter.h" -#include "ui/gfx/point.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/point.h" +#include "ui/gfx/geometry/size.h" namespace cc { diff --git a/cc/layers/io_surface_layer_impl.h b/cc/layers/io_surface_layer_impl.h index 17b7093..663bcef 100644 --- a/cc/layers/io_surface_layer_impl.h +++ b/cc/layers/io_surface_layer_impl.h @@ -9,7 +9,7 @@ #include "cc/base/cc_export.h" #include "cc/layers/layer_impl.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace cc { diff --git a/cc/layers/layer.cc b/cc/layers/layer.cc index dd71307..08f39b9 100644 --- a/cc/layers/layer.cc +++ b/cc/layers/layer.cc @@ -26,8 +26,8 @@ #include "cc/trees/layer_tree_host.h" #include "cc/trees/layer_tree_impl.h" #include "third_party/skia/include/core/SkImageFilter.h" +#include "ui/gfx/geometry/rect_conversions.h" #include "ui/gfx/geometry/vector2d_conversions.h" -#include "ui/gfx/rect_conversions.h" namespace cc { diff --git a/cc/layers/layer.h b/cc/layers/layer.h index c6279af1..f372186 100644 --- a/cc/layers/layer.h +++ b/cc/layers/layer.h @@ -29,10 +29,10 @@ #include "third_party/skia/include/core/SkImageFilter.h" #include "third_party/skia/include/core/SkPicture.h" #include "third_party/skia/include/core/SkXfermode.h" +#include "ui/gfx/geometry/point3_f.h" +#include "ui/gfx/geometry/rect.h" +#include "ui/gfx/geometry/rect_f.h" #include "ui/gfx/geometry/scroll_offset.h" -#include "ui/gfx/point3_f.h" -#include "ui/gfx/rect.h" -#include "ui/gfx/rect_f.h" #include "ui/gfx/transform.h" namespace gfx { diff --git a/cc/layers/layer_impl.cc b/cc/layers/layer_impl.cc index 2973519..391fa92 100644 --- a/cc/layers/layer_impl.cc +++ b/cc/layers/layer_impl.cc @@ -26,12 +26,12 @@ #include "cc/trees/layer_tree_impl.h" #include "cc/trees/layer_tree_settings.h" #include "cc/trees/proxy.h" -#include "ui/gfx/box_f.h" +#include "ui/gfx/geometry/box_f.h" +#include "ui/gfx/geometry/point_conversions.h" +#include "ui/gfx/geometry/quad_f.h" +#include "ui/gfx/geometry/rect_conversions.h" +#include "ui/gfx/geometry/size_conversions.h" #include "ui/gfx/geometry/vector2d_conversions.h" -#include "ui/gfx/point_conversions.h" -#include "ui/gfx/quad_f.h" -#include "ui/gfx/rect_conversions.h" -#include "ui/gfx/size_conversions.h" namespace cc { LayerImpl::LayerImpl(LayerTreeImpl* tree_impl, int id) diff --git a/cc/layers/layer_impl.h b/cc/layers/layer_impl.h index bcac36c..1c14eeb 100644 --- a/cc/layers/layer_impl.h +++ b/cc/layers/layer_impl.h @@ -31,10 +31,10 @@ #include "third_party/skia/include/core/SkColor.h" #include "third_party/skia/include/core/SkImageFilter.h" #include "third_party/skia/include/core/SkPicture.h" +#include "ui/gfx/geometry/point3_f.h" +#include "ui/gfx/geometry/rect.h" +#include "ui/gfx/geometry/rect_f.h" #include "ui/gfx/geometry/scroll_offset.h" -#include "ui/gfx/point3_f.h" -#include "ui/gfx/rect.h" -#include "ui/gfx/rect_f.h" #include "ui/gfx/transform.h" namespace base { diff --git a/cc/layers/layer_utils.cc b/cc/layers/layer_utils.cc index 9c299c2..888174a 100644 --- a/cc/layers/layer_utils.cc +++ b/cc/layers/layer_utils.cc @@ -6,7 +6,7 @@ #include "cc/layers/layer_impl.h" #include "cc/trees/layer_tree_host_common.h" -#include "ui/gfx/box_f.h" +#include "ui/gfx/geometry/box_f.h" namespace cc { diff --git a/cc/layers/layer_utils_unittest.cc b/cc/layers/layer_utils_unittest.cc index bf4e9db..1eb1986 100644 --- a/cc/layers/layer_utils_unittest.cc +++ b/cc/layers/layer_utils_unittest.cc @@ -11,7 +11,7 @@ #include "cc/test/fake_layer_tree_host_impl.h" #include "cc/test/test_shared_bitmap_manager.h" #include "testing/gtest/include/gtest/gtest.h" -#include "ui/gfx/box_f.h" +#include "ui/gfx/geometry/box_f.h" #include "ui/gfx/test/gfx_util.h" namespace cc { diff --git a/cc/layers/nine_patch_layer.h b/cc/layers/nine_patch_layer.h index f5aa712..9054610 100644 --- a/cc/layers/nine_patch_layer.h +++ b/cc/layers/nine_patch_layer.h @@ -10,7 +10,7 @@ #include "cc/layers/layer.h" #include "cc/layers/ui_resource_layer.h" #include "cc/resources/ui_resource_client.h" -#include "ui/gfx/rect.h" +#include "ui/gfx/geometry/rect.h" namespace cc { diff --git a/cc/layers/nine_patch_layer_impl.cc b/cc/layers/nine_patch_layer_impl.cc index b350ba9..1c76d11 100644 --- a/cc/layers/nine_patch_layer_impl.cc +++ b/cc/layers/nine_patch_layer_impl.cc @@ -10,7 +10,7 @@ #include "cc/quads/texture_draw_quad.h" #include "cc/trees/layer_tree_impl.h" #include "cc/trees/occlusion.h" -#include "ui/gfx/rect_f.h" +#include "ui/gfx/geometry/rect_f.h" namespace cc { diff --git a/cc/layers/nine_patch_layer_impl.h b/cc/layers/nine_patch_layer_impl.h index 9af6f32..5320d39 100644 --- a/cc/layers/nine_patch_layer_impl.h +++ b/cc/layers/nine_patch_layer_impl.h @@ -12,8 +12,8 @@ #include "cc/layers/ui_resource_layer_impl.h" #include "cc/resources/resource_provider.h" #include "cc/resources/ui_resource_client.h" -#include "ui/gfx/rect.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/rect.h" +#include "ui/gfx/geometry/size.h" namespace base { class DictionaryValue; diff --git a/cc/layers/nine_patch_layer_impl_unittest.cc b/cc/layers/nine_patch_layer_impl_unittest.cc index 2b82d48..730b3e5 100644 --- a/cc/layers/nine_patch_layer_impl_unittest.cc +++ b/cc/layers/nine_patch_layer_impl_unittest.cc @@ -15,8 +15,8 @@ #include "cc/trees/single_thread_proxy.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" -#include "ui/gfx/rect_conversions.h" -#include "ui/gfx/safe_integer_conversions.h" +#include "ui/gfx/geometry/rect_conversions.h" +#include "ui/gfx/geometry/safe_integer_conversions.h" #include "ui/gfx/transform.h" namespace cc { diff --git a/cc/layers/paint_properties.h b/cc/layers/paint_properties.h index 323e949..b57f90f 100644 --- a/cc/layers/paint_properties.h +++ b/cc/layers/paint_properties.h @@ -5,7 +5,7 @@ #ifndef CC_LAYERS_PAINT_PROPERTIES_H_ #define CC_LAYERS_PAINT_PROPERTIES_H_ -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace cc { diff --git a/cc/layers/painted_scrollbar_layer_impl.cc b/cc/layers/painted_scrollbar_layer_impl.cc index dcb1e82..ea48086 100644 --- a/cc/layers/painted_scrollbar_layer_impl.cc +++ b/cc/layers/painted_scrollbar_layer_impl.cc @@ -13,7 +13,7 @@ #include "cc/trees/layer_tree_impl.h" #include "cc/trees/layer_tree_settings.h" #include "cc/trees/occlusion.h" -#include "ui/gfx/rect_conversions.h" +#include "ui/gfx/geometry/rect_conversions.h" namespace cc { diff --git a/cc/layers/picture_image_layer.h b/cc/layers/picture_image_layer.h index 3467804..3575d88 100644 --- a/cc/layers/picture_image_layer.h +++ b/cc/layers/picture_image_layer.h @@ -9,7 +9,7 @@ #include "cc/layers/content_layer_client.h" #include "cc/layers/picture_layer.h" #include "third_party/skia/include/core/SkBitmap.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace cc { diff --git a/cc/layers/picture_layer.cc b/cc/layers/picture_layer.cc index 1bb7d54..ca4033f 100644 --- a/cc/layers/picture_layer.cc +++ b/cc/layers/picture_layer.cc @@ -9,7 +9,7 @@ #include "cc/layers/picture_layer_impl.h" #include "cc/trees/layer_tree_impl.h" #include "third_party/skia/include/core/SkPictureRecorder.h" -#include "ui/gfx/rect_conversions.h" +#include "ui/gfx/geometry/rect_conversions.h" namespace cc { diff --git a/cc/layers/picture_layer_impl.cc b/cc/layers/picture_layer_impl.cc index 2599852..687243c 100644 --- a/cc/layers/picture_layer_impl.cc +++ b/cc/layers/picture_layer_impl.cc @@ -26,9 +26,9 @@ #include "cc/resources/tile_manager.h" #include "cc/trees/layer_tree_impl.h" #include "cc/trees/occlusion.h" -#include "ui/gfx/quad_f.h" -#include "ui/gfx/rect_conversions.h" -#include "ui/gfx/size_conversions.h" +#include "ui/gfx/geometry/quad_f.h" +#include "ui/gfx/geometry/rect_conversions.h" +#include "ui/gfx/geometry/size_conversions.h" namespace { const float kMaxScaleRatioDuringPinch = 2.0f; diff --git a/cc/layers/picture_layer_impl_unittest.cc b/cc/layers/picture_layer_impl_unittest.cc index 038dc2a..e8c83e1 100644 --- a/cc/layers/picture_layer_impl_unittest.cc +++ b/cc/layers/picture_layer_impl_unittest.cc @@ -28,8 +28,8 @@ #include "cc/test/test_web_graphics_context_3d.h" #include "cc/trees/layer_tree_impl.h" #include "testing/gtest/include/gtest/gtest.h" -#include "ui/gfx/rect_conversions.h" -#include "ui/gfx/size_conversions.h" +#include "ui/gfx/geometry/rect_conversions.h" +#include "ui/gfx/geometry/size_conversions.h" namespace cc { namespace { diff --git a/cc/layers/render_surface.h b/cc/layers/render_surface.h index 4da8d23..1e3719d 100644 --- a/cc/layers/render_surface.h +++ b/cc/layers/render_surface.h @@ -12,8 +12,8 @@ #include "base/memory/ref_counted.h" #include "cc/base/cc_export.h" #include "cc/layers/layer_lists.h" -#include "ui/gfx/rect.h" -#include "ui/gfx/rect_f.h" +#include "ui/gfx/geometry/rect.h" +#include "ui/gfx/geometry/rect_f.h" #include "ui/gfx/transform.h" namespace cc { diff --git a/cc/layers/render_surface_impl.cc b/cc/layers/render_surface_impl.cc index ecb97a3..9d36235 100644 --- a/cc/layers/render_surface_impl.cc +++ b/cc/layers/render_surface_impl.cc @@ -20,7 +20,7 @@ #include "cc/trees/damage_tracker.h" #include "cc/trees/occlusion_tracker.h" #include "third_party/skia/include/core/SkImageFilter.h" -#include "ui/gfx/rect_conversions.h" +#include "ui/gfx/geometry/rect_conversions.h" #include "ui/gfx/transform.h" namespace cc { diff --git a/cc/layers/render_surface_impl.h b/cc/layers/render_surface_impl.h index 52e4f38..3303e94 100644 --- a/cc/layers/render_surface_impl.h +++ b/cc/layers/render_surface_impl.h @@ -14,8 +14,8 @@ #include "cc/layers/layer_lists.h" #include "cc/quads/render_pass.h" #include "cc/quads/shared_quad_state.h" -#include "ui/gfx/rect.h" -#include "ui/gfx/rect_f.h" +#include "ui/gfx/geometry/rect.h" +#include "ui/gfx/geometry/rect_f.h" #include "ui/gfx/transform.h" namespace cc { diff --git a/cc/layers/scrollbar_layer_impl_base.cc b/cc/layers/scrollbar_layer_impl_base.cc index 8d93a54..4248617 100644 --- a/cc/layers/scrollbar_layer_impl_base.cc +++ b/cc/layers/scrollbar_layer_impl_base.cc @@ -6,7 +6,7 @@ #include <algorithm> #include "cc/trees/layer_tree_impl.h" -#include "ui/gfx/rect_conversions.h" +#include "ui/gfx/geometry/rect_conversions.h" namespace cc { diff --git a/cc/layers/tiled_layer.cc b/cc/layers/tiled_layer.cc index e4d5f7c..2a32741 100644 --- a/cc/layers/tiled_layer.cc +++ b/cc/layers/tiled_layer.cc @@ -19,7 +19,7 @@ #include "cc/trees/layer_tree_host.h" #include "cc/trees/occlusion_tracker.h" #include "third_party/khronos/GLES2/gl2.h" -#include "ui/gfx/rect_conversions.h" +#include "ui/gfx/geometry/rect_conversions.h" namespace cc { diff --git a/cc/layers/tiled_layer_impl.cc b/cc/layers/tiled_layer_impl.cc index 6052591..c66e124 100644 --- a/cc/layers/tiled_layer_impl.cc +++ b/cc/layers/tiled_layer_impl.cc @@ -19,7 +19,7 @@ #include "cc/trees/occlusion.h" #include "third_party/khronos/GLES2/gl2.h" #include "third_party/skia/include/core/SkColor.h" -#include "ui/gfx/quad_f.h" +#include "ui/gfx/geometry/quad_f.h" namespace cc { diff --git a/cc/layers/tiled_layer_unittest.cc b/cc/layers/tiled_layer_unittest.cc index 862ff1f..0f3112c 100644 --- a/cc/layers/tiled_layer_unittest.cc +++ b/cc/layers/tiled_layer_unittest.cc @@ -25,7 +25,7 @@ #include "cc/trees/occlusion_tracker.h" #include "cc/trees/single_thread_proxy.h" #include "testing/gtest/include/gtest/gtest.h" -#include "ui/gfx/rect_conversions.h" +#include "ui/gfx/geometry/rect_conversions.h" #include "ui/gfx/transform.h" namespace cc { diff --git a/cc/layers/ui_resource_layer.h b/cc/layers/ui_resource_layer.h index e22318c..3bfd9b2 100644 --- a/cc/layers/ui_resource_layer.h +++ b/cc/layers/ui_resource_layer.h @@ -9,7 +9,7 @@ #include "cc/base/cc_export.h" #include "cc/layers/layer.h" #include "cc/resources/ui_resource_client.h" -#include "ui/gfx/rect.h" +#include "ui/gfx/geometry/rect.h" namespace cc { diff --git a/cc/layers/ui_resource_layer_impl.cc b/cc/layers/ui_resource_layer_impl.cc index dc08a90..35d242be 100644 --- a/cc/layers/ui_resource_layer_impl.cc +++ b/cc/layers/ui_resource_layer_impl.cc @@ -10,7 +10,7 @@ #include "cc/quads/texture_draw_quad.h" #include "cc/trees/layer_tree_impl.h" #include "cc/trees/occlusion.h" -#include "ui/gfx/rect_f.h" +#include "ui/gfx/geometry/rect_f.h" namespace cc { diff --git a/cc/layers/ui_resource_layer_impl.h b/cc/layers/ui_resource_layer_impl.h index 515a0f1..d98f1fb 100644 --- a/cc/layers/ui_resource_layer_impl.h +++ b/cc/layers/ui_resource_layer_impl.h @@ -11,8 +11,8 @@ #include "cc/layers/layer_impl.h" #include "cc/resources/resource_provider.h" #include "cc/resources/ui_resource_client.h" -#include "ui/gfx/rect.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/rect.h" +#include "ui/gfx/geometry/size.h" namespace base { class DictionaryValue; diff --git a/cc/output/copy_output_request.h b/cc/output/copy_output_request.h index 60a5f11..58aa790 100644 --- a/cc/output/copy_output_request.h +++ b/cc/output/copy_output_request.h @@ -10,7 +10,7 @@ #include "cc/base/cc_export.h" #include "cc/resources/single_release_callback.h" #include "cc/resources/texture_mailbox.h" -#include "ui/gfx/rect.h" +#include "ui/gfx/geometry/rect.h" class SkBitmap; diff --git a/cc/output/copy_output_result.h b/cc/output/copy_output_result.h index 8529e3f..3662818 100644 --- a/cc/output/copy_output_result.h +++ b/cc/output/copy_output_result.h @@ -9,7 +9,7 @@ #include "cc/base/cc_export.h" #include "cc/resources/single_release_callback.h" #include "cc/resources/texture_mailbox.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" class SkBitmap; diff --git a/cc/output/filter_operations_unittest.cc b/cc/output/filter_operations_unittest.cc index e97379c..d6ae6ab 100644 --- a/cc/output/filter_operations_unittest.cc +++ b/cc/output/filter_operations_unittest.cc @@ -6,7 +6,7 @@ #include "skia/ext/refptr.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/skia/include/effects/SkBlurImageFilter.h" -#include "ui/gfx/point.h" +#include "ui/gfx/geometry/point.h" namespace cc { namespace { diff --git a/cc/output/output_surface_client.h b/cc/output/output_surface_client.h index bb37a91..99b174b 100644 --- a/cc/output/output_surface_client.h +++ b/cc/output/output_surface_client.h @@ -11,7 +11,7 @@ #include "cc/base/cc_export.h" #include "cc/output/begin_frame_args.h" #include "cc/output/context_provider.h" -#include "ui/gfx/rect.h" +#include "ui/gfx/geometry/rect.h" namespace gfx { class Transform; diff --git a/cc/quads/content_draw_quad_base.h b/cc/quads/content_draw_quad_base.h index 6917e6b..b0e53dc 100644 --- a/cc/quads/content_draw_quad_base.h +++ b/cc/quads/content_draw_quad_base.h @@ -9,8 +9,8 @@ #include "cc/base/cc_export.h" #include "cc/quads/draw_quad.h" #include "third_party/khronos/GLES2/gl2.h" -#include "ui/gfx/point.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/point.h" +#include "ui/gfx/geometry/size.h" namespace cc { diff --git a/cc/quads/draw_polygon.h b/cc/quads/draw_polygon.h index a1a6e83..32643ee 100644 --- a/cc/quads/draw_polygon.h +++ b/cc/quads/draw_polygon.h @@ -9,10 +9,10 @@ #include "cc/base/math_util.h" #include "cc/output/bsp_compare_result.h" +#include "ui/gfx/geometry/point3_f.h" +#include "ui/gfx/geometry/quad_f.h" +#include "ui/gfx/geometry/rect_f.h" #include "ui/gfx/geometry/vector3d_f.h" -#include "ui/gfx/point3_f.h" -#include "ui/gfx/quad_f.h" -#include "ui/gfx/rect_f.h" #include "ui/gfx/transform.h" namespace cc { diff --git a/cc/quads/draw_quad.cc b/cc/quads/draw_quad.cc index 38b24b0..7322a7a 100644 --- a/cc/quads/draw_quad.cc +++ b/cc/quads/draw_quad.cc @@ -20,7 +20,7 @@ #include "cc/quads/texture_draw_quad.h" #include "cc/quads/tile_draw_quad.h" #include "cc/quads/yuv_video_draw_quad.h" -#include "ui/gfx/quad_f.h" +#include "ui/gfx/geometry/quad_f.h" namespace cc { diff --git a/cc/quads/io_surface_draw_quad.h b/cc/quads/io_surface_draw_quad.h index 9c8b50b..ba64384 100644 --- a/cc/quads/io_surface_draw_quad.h +++ b/cc/quads/io_surface_draw_quad.h @@ -8,7 +8,7 @@ #include "base/memory/scoped_ptr.h" #include "cc/base/cc_export.h" #include "cc/quads/draw_quad.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace cc { diff --git a/cc/quads/picture_draw_quad.h b/cc/quads/picture_draw_quad.h index d2a7271..1bea1a2 100644 --- a/cc/quads/picture_draw_quad.h +++ b/cc/quads/picture_draw_quad.h @@ -10,9 +10,9 @@ #include "cc/base/cc_export.h" #include "cc/quads/content_draw_quad_base.h" #include "cc/resources/picture_pile_impl.h" -#include "ui/gfx/rect.h" -#include "ui/gfx/rect_f.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/rect.h" +#include "ui/gfx/geometry/rect_f.h" +#include "ui/gfx/geometry/size.h" namespace cc { diff --git a/cc/quads/render_pass.h b/cc/quads/render_pass.h index 65c712d..76536b5 100644 --- a/cc/quads/render_pass.h +++ b/cc/quads/render_pass.h @@ -15,8 +15,8 @@ #include "cc/quads/list_container.h" #include "cc/quads/render_pass_id.h" #include "skia/ext/refptr.h" -#include "ui/gfx/rect.h" -#include "ui/gfx/rect_f.h" +#include "ui/gfx/geometry/rect.h" +#include "ui/gfx/geometry/rect_f.h" #include "ui/gfx/transform.h" namespace base { diff --git a/cc/quads/shared_quad_state.h b/cc/quads/shared_quad_state.h index dde87a8..ebf7d11 100644 --- a/cc/quads/shared_quad_state.h +++ b/cc/quads/shared_quad_state.h @@ -8,7 +8,7 @@ #include "base/memory/scoped_ptr.h" #include "cc/base/cc_export.h" #include "third_party/skia/include/core/SkXfermode.h" -#include "ui/gfx/rect.h" +#include "ui/gfx/geometry/rect.h" #include "ui/gfx/transform.h" namespace base { diff --git a/cc/quads/texture_draw_quad.cc b/cc/quads/texture_draw_quad.cc index 72435c2..9ff9744 100644 --- a/cc/quads/texture_draw_quad.cc +++ b/cc/quads/texture_draw_quad.cc @@ -8,7 +8,7 @@ #include "base/logging.h" #include "base/values.h" #include "cc/base/math_util.h" -#include "ui/gfx/vector2d_f.h" +#include "ui/gfx/geometry/vector2d_f.h" namespace cc { diff --git a/cc/quads/texture_draw_quad.h b/cc/quads/texture_draw_quad.h index 3e0632c..9137d51 100644 --- a/cc/quads/texture_draw_quad.h +++ b/cc/quads/texture_draw_quad.h @@ -8,7 +8,7 @@ #include "base/memory/scoped_ptr.h" #include "cc/base/cc_export.h" #include "cc/quads/draw_quad.h" -#include "ui/gfx/rect_f.h" +#include "ui/gfx/geometry/rect_f.h" namespace cc { diff --git a/cc/resources/content_layer_updater.cc b/cc/resources/content_layer_updater.cc index f6469ff..971362f 100644 --- a/cc/resources/content_layer_updater.cc +++ b/cc/resources/content_layer_updater.cc @@ -5,15 +5,13 @@ #include "cc/resources/content_layer_updater.h" #include "base/debug/trace_event.h" -#include "base/time/time.h" #include "cc/debug/rendering_stats_instrumentation.h" #include "cc/resources/layer_painter.h" #include "third_party/skia/include/core/SkCanvas.h" -#include "third_party/skia/include/core/SkPaint.h" #include "third_party/skia/include/core/SkRect.h" #include "third_party/skia/include/core/SkScalar.h" -#include "ui/gfx/rect_conversions.h" -#include "ui/gfx/rect_f.h" +#include "ui/gfx/geometry/rect_conversions.h" +#include "ui/gfx/geometry/rect_f.h" #include "ui/gfx/skia_util.h" namespace cc { diff --git a/cc/resources/content_layer_updater.h b/cc/resources/content_layer_updater.h index e0c54e5..4ba18ba 100644 --- a/cc/resources/content_layer_updater.h +++ b/cc/resources/content_layer_updater.h @@ -7,7 +7,7 @@ #include "cc/base/cc_export.h" #include "cc/resources/layer_updater.h" -#include "ui/gfx/rect.h" +#include "ui/gfx/geometry/rect.h" class SkCanvas; diff --git a/cc/resources/gpu_memory_buffer_manager.h b/cc/resources/gpu_memory_buffer_manager.h index 1e114c3..52434e0 100644 --- a/cc/resources/gpu_memory_buffer_manager.h +++ b/cc/resources/gpu_memory_buffer_manager.h @@ -7,8 +7,8 @@ #include "base/memory/scoped_ptr.h" #include "cc/base/cc_export.h" +#include "ui/gfx/geometry/size.h" #include "ui/gfx/gpu_memory_buffer.h" -#include "ui/gfx/size.h" namespace cc { diff --git a/cc/resources/layer_quad.cc b/cc/resources/layer_quad.cc index fdd6866..38ec7b3 100644 --- a/cc/resources/layer_quad.cc +++ b/cc/resources/layer_quad.cc @@ -5,7 +5,7 @@ #include "cc/resources/layer_quad.h" #include "base/logging.h" -#include "ui/gfx/quad_f.h" +#include "ui/gfx/geometry/quad_f.h" namespace cc { diff --git a/cc/resources/layer_quad.h b/cc/resources/layer_quad.h index 1d71193..ed1db10 100644 --- a/cc/resources/layer_quad.h +++ b/cc/resources/layer_quad.h @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "cc/base/cc_export.h" -#include "ui/gfx/point_f.h" +#include "ui/gfx/geometry/point_f.h" namespace gfx { class QuadF; diff --git a/cc/resources/layer_quad_unittest.cc b/cc/resources/layer_quad_unittest.cc index 8d3909c..3560b8d 100644 --- a/cc/resources/layer_quad_unittest.cc +++ b/cc/resources/layer_quad_unittest.cc @@ -5,7 +5,7 @@ #include "cc/resources/layer_quad.h" #include "testing/gtest/include/gtest/gtest.h" -#include "ui/gfx/quad_f.h" +#include "ui/gfx/geometry/quad_f.h" namespace cc { namespace { diff --git a/cc/resources/layer_tiling_data.h b/cc/resources/layer_tiling_data.h index b369d61..5168118 100644 --- a/cc/resources/layer_tiling_data.h +++ b/cc/resources/layer_tiling_data.h @@ -14,7 +14,7 @@ #include "cc/base/cc_export.h" #include "cc/base/simple_enclosed_region.h" #include "cc/base/tiling_data.h" -#include "ui/gfx/rect.h" +#include "ui/gfx/geometry/rect.h" namespace cc { diff --git a/cc/resources/layer_updater.h b/cc/resources/layer_updater.h index 4614c5a..a5eb0a1 100644 --- a/cc/resources/layer_updater.h +++ b/cc/resources/layer_updater.h @@ -9,8 +9,8 @@ #include "base/memory/scoped_ptr.h" #include "cc/base/cc_export.h" #include "third_party/skia/include/core/SkColor.h" -#include "ui/gfx/rect.h" -#include "ui/gfx/vector2d.h" +#include "ui/gfx/geometry/rect.h" +#include "ui/gfx/geometry/vector2d.h" namespace cc { diff --git a/cc/resources/picture.cc b/cc/resources/picture.cc index d9b10be..c35da96 100644 --- a/cc/resources/picture.cc +++ b/cc/resources/picture.cc @@ -18,17 +18,16 @@ #include "cc/debug/traced_value.h" #include "cc/layers/content_layer_client.h" #include "skia/ext/pixel_ref_utils.h" +#include "third_party/skia/include/core/SkBBHFactory.h" #include "third_party/skia/include/core/SkCanvas.h" #include "third_party/skia/include/core/SkData.h" -#include "third_party/skia/include/core/SkDrawFilter.h" #include "third_party/skia/include/core/SkPaint.h" #include "third_party/skia/include/core/SkPictureRecorder.h" #include "third_party/skia/include/core/SkStream.h" #include "third_party/skia/include/utils/SkNullCanvas.h" -#include "third_party/skia/include/utils/SkPictureUtils.h" #include "ui/gfx/codec/jpeg_codec.h" #include "ui/gfx/codec/png_codec.h" -#include "ui/gfx/rect_conversions.h" +#include "ui/gfx/geometry/rect_conversions.h" #include "ui/gfx/skia_util.h" namespace cc { diff --git a/cc/resources/picture.h b/cc/resources/picture.h index e0b6441..1677309 100644 --- a/cc/resources/picture.h +++ b/cc/resources/picture.h @@ -21,7 +21,7 @@ #include "skia/ext/refptr.h" #include "third_party/skia/include/core/SkBBHFactory.h" #include "third_party/skia/include/core/SkPicture.h" -#include "ui/gfx/rect.h" +#include "ui/gfx/geometry/rect.h" class SkPixelRef; diff --git a/cc/resources/picture_layer_tiling.cc b/cc/resources/picture_layer_tiling.cc index 38e2dc4..4dc46e0 100644 --- a/cc/resources/picture_layer_tiling.cc +++ b/cc/resources/picture_layer_tiling.cc @@ -15,10 +15,10 @@ #include "cc/base/math_util.h" #include "cc/resources/tile.h" #include "cc/resources/tile_priority.h" -#include "ui/gfx/point_conversions.h" -#include "ui/gfx/rect_conversions.h" -#include "ui/gfx/safe_integer_conversions.h" -#include "ui/gfx/size_conversions.h" +#include "ui/gfx/geometry/point_conversions.h" +#include "ui/gfx/geometry/rect_conversions.h" +#include "ui/gfx/geometry/safe_integer_conversions.h" +#include "ui/gfx/geometry/size_conversions.h" namespace cc { namespace { diff --git a/cc/resources/picture_layer_tiling.h b/cc/resources/picture_layer_tiling.h index 5da4c8d..f692702 100644 --- a/cc/resources/picture_layer_tiling.h +++ b/cc/resources/picture_layer_tiling.h @@ -18,7 +18,7 @@ #include "cc/resources/tile.h" #include "cc/resources/tile_priority.h" #include "cc/trees/occlusion.h" -#include "ui/gfx/rect.h" +#include "ui/gfx/geometry/rect.h" namespace base { namespace debug { diff --git a/cc/resources/picture_layer_tiling_set.h b/cc/resources/picture_layer_tiling_set.h index 6f61243..ddde1d7 100644 --- a/cc/resources/picture_layer_tiling_set.h +++ b/cc/resources/picture_layer_tiling_set.h @@ -8,7 +8,7 @@ #include "cc/base/region.h" #include "cc/base/scoped_ptr_vector.h" #include "cc/resources/picture_layer_tiling.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace base { namespace debug { diff --git a/cc/resources/picture_layer_tiling_set_unittest.cc b/cc/resources/picture_layer_tiling_set_unittest.cc index 3d249f3..2005175 100644 --- a/cc/resources/picture_layer_tiling_set_unittest.cc +++ b/cc/resources/picture_layer_tiling_set_unittest.cc @@ -7,15 +7,13 @@ #include <map> #include <vector> -#include "cc/resources/resource_pool.h" #include "cc/resources/resource_provider.h" #include "cc/test/fake_output_surface.h" #include "cc/test/fake_output_surface_client.h" #include "cc/test/fake_picture_layer_tiling_client.h" -#include "cc/test/fake_tile_manager_client.h" #include "cc/test/test_shared_bitmap_manager.h" #include "testing/gtest/include/gtest/gtest.h" -#include "ui/gfx/size_conversions.h" +#include "ui/gfx/geometry/size_conversions.h" namespace cc { namespace { diff --git a/cc/resources/picture_layer_tiling_unittest.cc b/cc/resources/picture_layer_tiling_unittest.cc index 07da353..2952c6a 100644 --- a/cc/resources/picture_layer_tiling_unittest.cc +++ b/cc/resources/picture_layer_tiling_unittest.cc @@ -15,8 +15,9 @@ #include "cc/test/test_context_provider.h" #include "cc/test/test_shared_bitmap_manager.h" #include "testing/gtest/include/gtest/gtest.h" -#include "ui/gfx/rect_conversions.h" -#include "ui/gfx/size_conversions.h" +#include "ui/gfx/geometry/quad_f.h" +#include "ui/gfx/geometry/rect_conversions.h" +#include "ui/gfx/geometry/size_conversions.h" namespace cc { namespace { diff --git a/cc/resources/picture_pile.cc b/cc/resources/picture_pile.cc index 93464f6..372bcbd 100644 --- a/cc/resources/picture_pile.cc +++ b/cc/resources/picture_pile.cc @@ -10,9 +10,8 @@ #include "cc/base/region.h" #include "cc/debug/rendering_stats_instrumentation.h" -#include "cc/resources/picture_pile_impl.h" #include "cc/resources/raster_worker_pool.h" -#include "cc/resources/tile_priority.h" +#include "skia/ext/analysis_canvas.h" namespace { // Layout pixel buffer around the visible layer rect to record. Any base diff --git a/cc/resources/picture_pile.h b/cc/resources/picture_pile.h index d68387f..595ded4 100644 --- a/cc/resources/picture_pile.h +++ b/cc/resources/picture_pile.h @@ -6,7 +6,7 @@ #define CC_RESOURCES_PICTURE_PILE_H_ #include "cc/resources/picture_pile_base.h" -#include "ui/gfx/rect.h" +#include "ui/gfx/geometry/rect.h" namespace cc { class PicturePileImpl; diff --git a/cc/resources/picture_pile_base.cc b/cc/resources/picture_pile_base.cc index d850e41..45db791 100644 --- a/cc/resources/picture_pile_base.cc +++ b/cc/resources/picture_pile_base.cc @@ -11,10 +11,9 @@ #include "base/debug/trace_event_argument.h" #include "base/logging.h" #include "base/values.h" -#include "cc/base/math_util.h" #include "cc/debug/traced_value.h" #include "third_party/skia/include/core/SkColor.h" -#include "ui/gfx/rect_conversions.h" +#include "ui/gfx/geometry/rect_conversions.h" namespace { // Dimensions of the tiles in this picture pile as well as the dimensions of diff --git a/cc/resources/picture_pile_base.h b/cc/resources/picture_pile_base.h index 991a29c..bb9116c 100644 --- a/cc/resources/picture_pile_base.h +++ b/cc/resources/picture_pile_base.h @@ -15,7 +15,7 @@ #include "cc/base/region.h" #include "cc/base/tiling_data.h" #include "cc/resources/picture.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace base { namespace debug { diff --git a/cc/resources/picture_pile_impl.cc b/cc/resources/picture_pile_impl.cc index e19dd2c..e8cee1e 100644 --- a/cc/resources/picture_pile_impl.cc +++ b/cc/resources/picture_pile_impl.cc @@ -12,10 +12,7 @@ #include "skia/ext/analysis_canvas.h" #include "third_party/skia/include/core/SkCanvas.h" #include "third_party/skia/include/core/SkPictureRecorder.h" -#include "third_party/skia/include/core/SkSize.h" -#include "ui/gfx/rect_conversions.h" -#include "ui/gfx/size_conversions.h" -#include "ui/gfx/skia_util.h" +#include "ui/gfx/geometry/rect_conversions.h" namespace cc { diff --git a/cc/resources/picture_pile_impl_unittest.cc b/cc/resources/picture_pile_impl_unittest.cc index d0daa6b..0ced279 100644 --- a/cc/resources/picture_pile_impl_unittest.cc +++ b/cc/resources/picture_pile_impl_unittest.cc @@ -10,8 +10,8 @@ #include "testing/gtest/include/gtest/gtest.h" #include "third_party/skia/include/core/SkPixelRef.h" #include "third_party/skia/include/core/SkShader.h" -#include "ui/gfx/rect.h" -#include "ui/gfx/size_conversions.h" +#include "ui/gfx/geometry/rect.h" +#include "ui/gfx/geometry/size_conversions.h" namespace cc { namespace { diff --git a/cc/resources/picture_pile_unittest.cc b/cc/resources/picture_pile_unittest.cc index 881055f..537872d 100644 --- a/cc/resources/picture_pile_unittest.cc +++ b/cc/resources/picture_pile_unittest.cc @@ -9,8 +9,8 @@ #include "cc/test/fake_content_layer_client.h" #include "cc/test/fake_rendering_stats_instrumentation.h" #include "testing/gtest/include/gtest/gtest.h" -#include "ui/gfx/rect_conversions.h" -#include "ui/gfx/size_conversions.h" +#include "ui/gfx/geometry/rect_conversions.h" +#include "ui/gfx/geometry/size_conversions.h" namespace cc { namespace { diff --git a/cc/resources/picture_unittest.cc b/cc/resources/picture_unittest.cc index 4abeceb..07faf0c 100644 --- a/cc/resources/picture_unittest.cc +++ b/cc/resources/picture_unittest.cc @@ -11,10 +11,8 @@ #include "cc/test/skia_common.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/skia/include/core/SkBBHFactory.h" -#include "third_party/skia/include/core/SkCanvas.h" #include "third_party/skia/include/core/SkGraphics.h" -#include "third_party/skia/include/core/SkPixelRef.h" -#include "ui/gfx/rect.h" +#include "ui/gfx/geometry/rect.h" #include "ui/gfx/skia_util.h" namespace cc { diff --git a/cc/resources/prioritized_resource.h b/cc/resources/prioritized_resource.h index 7920f81..e3bb2bc 100644 --- a/cc/resources/prioritized_resource.h +++ b/cc/resources/prioritized_resource.h @@ -9,12 +9,11 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "cc/base/cc_export.h" -#include "cc/resources/priority_calculator.h" #include "cc/resources/resource.h" #include "cc/resources/resource_provider.h" -#include "ui/gfx/rect.h" -#include "ui/gfx/size.h" -#include "ui/gfx/vector2d.h" +#include "ui/gfx/geometry/rect.h" +#include "ui/gfx/geometry/size.h" +#include "ui/gfx/geometry/vector2d.h" namespace cc { diff --git a/cc/resources/prioritized_resource_manager.cc b/cc/resources/prioritized_resource_manager.cc index 54ed308..657c14f 100644 --- a/cc/resources/prioritized_resource_manager.cc +++ b/cc/resources/prioritized_resource_manager.cc @@ -7,7 +7,6 @@ #include <algorithm> #include "base/debug/trace_event.h" -#include "base/stl_util.h" #include "cc/resources/prioritized_resource.h" #include "cc/resources/priority_calculator.h" #include "cc/trees/proxy.h" diff --git a/cc/resources/prioritized_resource_manager.h b/cc/resources/prioritized_resource_manager.h index 681fee35..b7583f4 100644 --- a/cc/resources/prioritized_resource_manager.h +++ b/cc/resources/prioritized_resource_manager.h @@ -16,12 +16,10 @@ #include "cc/resources/prioritized_resource.h" #include "cc/resources/priority_calculator.h" #include "cc/resources/resource.h" -#include "cc/trees/proxy.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace cc { -class PriorityCalculator; class Proxy; class CC_EXPORT PrioritizedResourceManager { diff --git a/cc/resources/priority_calculator.cc b/cc/resources/priority_calculator.cc index 2a0cd18..5f5916f 100644 --- a/cc/resources/priority_calculator.cc +++ b/cc/resources/priority_calculator.cc @@ -6,7 +6,7 @@ #include <algorithm> -#include "ui/gfx/rect.h" +#include "ui/gfx/geometry/rect.h" namespace cc { diff --git a/cc/resources/resource.h b/cc/resources/resource.h index 24cb88a..707d77e 100644 --- a/cc/resources/resource.h +++ b/cc/resources/resource.h @@ -8,7 +8,7 @@ #include "cc/base/cc_export.h" #include "cc/resources/resource_provider.h" #include "third_party/khronos/GLES2/gl2.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace cc { diff --git a/cc/resources/resource_provider.cc b/cc/resources/resource_provider.cc index 550475b..a37789a 100644 --- a/cc/resources/resource_provider.cc +++ b/cc/resources/resource_provider.cc @@ -27,9 +27,9 @@ #include "third_party/skia/include/core/SkSurface.h" #include "third_party/skia/include/gpu/GrContext.h" #include "ui/gfx/frame_time.h" +#include "ui/gfx/geometry/rect.h" +#include "ui/gfx/geometry/vector2d.h" #include "ui/gfx/gpu_memory_buffer.h" -#include "ui/gfx/rect.h" -#include "ui/gfx/vector2d.h" using gpu::gles2::GLES2Interface; diff --git a/cc/resources/resource_provider.h b/cc/resources/resource_provider.h index fbec8d1..2e2fecb 100644 --- a/cc/resources/resource_provider.h +++ b/cc/resources/resource_provider.h @@ -31,7 +31,7 @@ #include "third_party/khronos/GLES2/gl2ext.h" #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/core/SkCanvas.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" class GrContext; diff --git a/cc/resources/resource_provider_unittest.cc b/cc/resources/resource_provider_unittest.cc index 2c585c4..4efe74d 100644 --- a/cc/resources/resource_provider_unittest.cc +++ b/cc/resources/resource_provider_unittest.cc @@ -29,8 +29,8 @@ #include "testing/gtest/include/gtest/gtest.h" #include "third_party/khronos/GLES2/gl2.h" #include "third_party/khronos/GLES2/gl2ext.h" +#include "ui/gfx/geometry/rect.h" #include "ui/gfx/gpu_memory_buffer.h" -#include "ui/gfx/rect.h" using testing::Mock; using testing::NiceMock; diff --git a/cc/resources/resource_update.h b/cc/resources/resource_update.h index 1eddf83..d491141 100644 --- a/cc/resources/resource_update.h +++ b/cc/resources/resource_update.h @@ -6,8 +6,8 @@ #define CC_RESOURCES_RESOURCE_UPDATE_H_ #include "cc/base/cc_export.h" -#include "ui/gfx/rect.h" -#include "ui/gfx/vector2d.h" +#include "ui/gfx/geometry/rect.h" +#include "ui/gfx/geometry/vector2d.h" class SkBitmap; diff --git a/cc/resources/scoped_ui_resource.h b/cc/resources/scoped_ui_resource.h index f7def7f..0e5a02c 100644 --- a/cc/resources/scoped_ui_resource.h +++ b/cc/resources/scoped_ui_resource.h @@ -9,7 +9,6 @@ #include "cc/base/cc_export.h" #include "cc/resources/ui_resource_bitmap.h" #include "cc/resources/ui_resource_client.h" -#include "ui/gfx/size.h" namespace cc { diff --git a/cc/resources/shared_bitmap.h b/cc/resources/shared_bitmap.h index a90e47a..ca12710 100644 --- a/cc/resources/shared_bitmap.h +++ b/cc/resources/shared_bitmap.h @@ -10,7 +10,7 @@ #include "base/memory/shared_memory.h" #include "cc/base/cc_export.h" #include "gpu/command_buffer/common/mailbox.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace base { class SharedMemory; } diff --git a/cc/resources/shared_bitmap_manager.h b/cc/resources/shared_bitmap_manager.h index e6e49af..fe61b09 100644 --- a/cc/resources/shared_bitmap_manager.h +++ b/cc/resources/shared_bitmap_manager.h @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "cc/base/cc_export.h" #include "cc/resources/shared_bitmap.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace cc { diff --git a/cc/resources/texture_mailbox.cc b/cc/resources/texture_mailbox.cc index 90ce6be..92736f4 100644 --- a/cc/resources/texture_mailbox.cc +++ b/cc/resources/texture_mailbox.cc @@ -6,7 +6,6 @@ #include "base/logging.h" #include "cc/resources/shared_bitmap.h" -#include "third_party/khronos/GLES2/gl2.h" namespace cc { diff --git a/cc/resources/texture_mailbox.h b/cc/resources/texture_mailbox.h index 4626dd3..4a0b76a 100644 --- a/cc/resources/texture_mailbox.h +++ b/cc/resources/texture_mailbox.h @@ -7,11 +7,10 @@ #include <string> -#include "base/callback.h" #include "base/memory/shared_memory.h" #include "cc/base/cc_export.h" #include "gpu/command_buffer/common/mailbox_holder.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace cc { diff --git a/cc/resources/texture_uploader.cc b/cc/resources/texture_uploader.cc index 8c7010b..9526fcb 100644 --- a/cc/resources/texture_uploader.cc +++ b/cc/resources/texture_uploader.cc @@ -10,14 +10,13 @@ #include "base/debug/trace_event.h" #include "base/metrics/histogram.h" #include "cc/base/util.h" -#include "cc/resources/prioritized_resource.h" #include "cc/resources/resource.h" #include "gpu/GLES2/gl2extchromium.h" #include "gpu/command_buffer/client/gles2_interface.h" #include "third_party/khronos/GLES2/gl2.h" #include "third_party/khronos/GLES2/gl2ext.h" -#include "ui/gfx/rect.h" -#include "ui/gfx/vector2d.h" +#include "ui/gfx/geometry/rect.h" +#include "ui/gfx/geometry/vector2d.h" using gpu::gles2::GLES2Interface; diff --git a/cc/resources/tile.h b/cc/resources/tile.h index e61b5c5..a712a75 100644 --- a/cc/resources/tile.h +++ b/cc/resources/tile.h @@ -6,14 +6,12 @@ #define CC_RESOURCES_TILE_H_ #include "base/memory/ref_counted.h" -#include "base/memory/scoped_ptr.h" -#include "base/memory/scoped_vector.h" #include "cc/base/ref_counted_managed.h" #include "cc/resources/managed_tile_state.h" #include "cc/resources/picture_pile_impl.h" #include "cc/resources/tile_priority.h" -#include "ui/gfx/rect.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/rect.h" +#include "ui/gfx/geometry/size.h" namespace cc { diff --git a/cc/resources/tile_manager.cc b/cc/resources/tile_manager.cc index cb9d766..3cc81b6 100644 --- a/cc/resources/tile_manager.cc +++ b/cc/resources/tile_manager.cc @@ -20,7 +20,7 @@ #include "cc/resources/raster_buffer.h" #include "cc/resources/rasterizer.h" #include "cc/resources/tile.h" -#include "ui/gfx/rect_conversions.h" +#include "ui/gfx/geometry/rect_conversions.h" namespace cc { namespace { diff --git a/cc/resources/tile_priority.h b/cc/resources/tile_priority.h index 433abad..d161057 100644 --- a/cc/resources/tile_priority.h +++ b/cc/resources/tile_priority.h @@ -9,12 +9,9 @@ #include <limits> #include <string> -#include "base/memory/ref_counted.h" +#include "base/debug/trace_event_argument.h" #include "base/memory/scoped_ptr.h" -#include "cc/resources/picture_pile.h" -#include "ui/gfx/quad_f.h" -#include "ui/gfx/rect.h" -#include "ui/gfx/size.h" +#include "cc/base/cc_export.h" namespace base { class Value; diff --git a/cc/resources/transferable_resource.cc b/cc/resources/transferable_resource.cc index a375f2e..558d6e8 100644 --- a/cc/resources/transferable_resource.cc +++ b/cc/resources/transferable_resource.cc @@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/logging.h" #include "cc/resources/returned_resource.h" #include "cc/resources/transferable_resource.h" diff --git a/cc/resources/transferable_resource.h b/cc/resources/transferable_resource.h index bd6b060..03b47e6 100644 --- a/cc/resources/transferable_resource.h +++ b/cc/resources/transferable_resource.h @@ -11,7 +11,7 @@ #include "cc/base/cc_export.h" #include "cc/resources/resource_format.h" #include "gpu/command_buffer/common/mailbox_holder.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace cc { diff --git a/cc/resources/ui_resource_bitmap.h b/cc/resources/ui_resource_bitmap.h index 09403a3..ec65113 100644 --- a/cc/resources/ui_resource_bitmap.h +++ b/cc/resources/ui_resource_bitmap.h @@ -10,8 +10,7 @@ #include "cc/base/cc_export.h" #include "skia/ext/refptr.h" #include "third_party/skia/include/core/SkPixelRef.h" -#include "third_party/skia/include/core/SkTypes.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" class SkBitmap; diff --git a/cc/resources/video_resource_updater.cc b/cc/resources/video_resource_updater.cc index 4d0e125..01a6042 100644 --- a/cc/resources/video_resource_updater.cc +++ b/cc/resources/video_resource_updater.cc @@ -14,7 +14,7 @@ #include "media/filters/skcanvas_video_renderer.h" #include "third_party/khronos/GLES2/gl2.h" #include "third_party/khronos/GLES2/gl2ext.h" -#include "ui/gfx/size_conversions.h" +#include "ui/gfx/geometry/size_conversions.h" namespace cc { diff --git a/cc/resources/video_resource_updater.h b/cc/resources/video_resource_updater.h index e9b924b..99800b4 100644 --- a/cc/resources/video_resource_updater.h +++ b/cc/resources/video_resource_updater.h @@ -9,13 +9,12 @@ #include "base/basictypes.h" #include "base/memory/ref_counted.h" -#include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "cc/base/cc_export.h" #include "cc/resources/release_callback_impl.h" #include "cc/resources/resource_format.h" #include "cc/resources/texture_mailbox.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace media { class SkCanvasVideoRenderer; diff --git a/cc/surfaces/surface.h b/cc/surfaces/surface.h index c55dfe8..ffa5042 100644 --- a/cc/surfaces/surface.h +++ b/cc/surfaces/surface.h @@ -18,7 +18,7 @@ #include "cc/quads/render_pass_id.h" #include "cc/surfaces/surface_id.h" #include "cc/surfaces/surfaces_export.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace ui { struct LatencyInfo; diff --git a/cc/surfaces/surface_aggregator_test_helpers.h b/cc/surfaces/surface_aggregator_test_helpers.h index 4e02472..6f3a342 100644 --- a/cc/surfaces/surface_aggregator_test_helpers.h +++ b/cc/surfaces/surface_aggregator_test_helpers.h @@ -10,7 +10,7 @@ #include "cc/quads/render_pass_id.h" #include "cc/surfaces/surface_id.h" #include "third_party/skia/include/core/SkColor.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace cc { diff --git a/cc/surfaces/surface_factory_unittest.cc b/cc/surfaces/surface_factory_unittest.cc index 636a5ff..4e0865a 100644 --- a/cc/surfaces/surface_factory_unittest.cc +++ b/cc/surfaces/surface_factory_unittest.cc @@ -9,7 +9,7 @@ #include "cc/surfaces/surface_factory_client.h" #include "cc/surfaces/surface_manager.h" #include "testing/gtest/include/gtest/gtest.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace cc { namespace { diff --git a/cc/surfaces/surface_unittest.cc b/cc/surfaces/surface_unittest.cc index d2b1dfa..b8990c55 100644 --- a/cc/surfaces/surface_unittest.cc +++ b/cc/surfaces/surface_unittest.cc @@ -6,7 +6,7 @@ #include "cc/surfaces/surface_factory.h" #include "cc/surfaces/surface_manager.h" #include "testing/gtest/include/gtest/gtest.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace cc { namespace { diff --git a/cc/test/fake_content_layer_client.h b/cc/test/fake_content_layer_client.h index 8f13284..7a7cc44 100644 --- a/cc/test/fake_content_layer_client.h +++ b/cc/test/fake_content_layer_client.h @@ -12,7 +12,7 @@ #include "cc/layers/content_layer_client.h" #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/core/SkPaint.h" -#include "ui/gfx/rect.h" +#include "ui/gfx/geometry/rect.h" namespace cc { diff --git a/cc/test/fake_picture_layer_tiling_client.h b/cc/test/fake_picture_layer_tiling_client.h index dece2fc..0e2f645 100644 --- a/cc/test/fake_picture_layer_tiling_client.h +++ b/cc/test/fake_picture_layer_tiling_client.h @@ -10,7 +10,7 @@ #include "cc/resources/tile.h" #include "cc/resources/tile_manager.h" #include "cc/test/fake_tile_manager_client.h" -#include "ui/gfx/rect.h" +#include "ui/gfx/geometry/rect.h" namespace cc { diff --git a/cc/test/layer_test_common.cc b/cc/test/layer_test_common.cc index 4ad0aec..a6dfa9c 100644 --- a/cc/test/layer_test_common.cc +++ b/cc/test/layer_test_common.cc @@ -13,10 +13,10 @@ #include "cc/test/mock_occlusion_tracker.h" #include "cc/trees/layer_tree_host_common.h" #include "testing/gtest/include/gtest/gtest.h" -#include "ui/gfx/point_conversions.h" -#include "ui/gfx/rect.h" -#include "ui/gfx/rect_conversions.h" -#include "ui/gfx/size_conversions.h" +#include "ui/gfx/geometry/point_conversions.h" +#include "ui/gfx/geometry/rect.h" +#include "ui/gfx/geometry/rect_conversions.h" +#include "ui/gfx/geometry/size_conversions.h" namespace cc { diff --git a/cc/test/layer_tree_test.cc b/cc/test/layer_tree_test.cc index c19c63f..aabad9b 100644 --- a/cc/test/layer_tree_test.cc +++ b/cc/test/layer_tree_test.cc @@ -29,7 +29,7 @@ #include "cc/trees/thread_proxy.h" #include "testing/gmock/include/gmock/gmock.h" #include "ui/gfx/frame_time.h" -#include "ui/gfx/size_conversions.h" +#include "ui/gfx/geometry/size_conversions.h" namespace cc { diff --git a/cc/test/pixel_comparator.cc b/cc/test/pixel_comparator.cc index 73807ed..4067787 100644 --- a/cc/test/pixel_comparator.cc +++ b/cc/test/pixel_comparator.cc @@ -7,7 +7,7 @@ #include <algorithm> #include "base/logging.h" -#include "ui/gfx/rect.h" +#include "ui/gfx/geometry/rect.h" namespace cc { diff --git a/cc/test/pixel_test.h b/cc/test/pixel_test.h index 838acaf..1a6c5ba 100644 --- a/cc/test/pixel_test.h +++ b/cc/test/pixel_test.h @@ -8,7 +8,7 @@ #include "cc/quads/render_pass.h" #include "cc/test/pixel_comparator.h" #include "testing/gtest/include/gtest/gtest.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #include "ui/gl/gl_implementation.h" #ifndef CC_TEST_PIXEL_TEST_H_ diff --git a/cc/test/render_pass_test_utils.cc b/cc/test/render_pass_test_utils.cc index c923b63..f9def0f 100644 --- a/cc/test/render_pass_test_utils.cc +++ b/cc/test/render_pass_test_utils.cc @@ -11,7 +11,7 @@ #include "cc/test/render_pass_test_common.h" #include "third_party/skia/include/core/SkColor.h" #include "third_party/skia/include/core/SkImageFilter.h" -#include "ui/gfx/rect.h" +#include "ui/gfx/geometry/rect.h" namespace cc { diff --git a/cc/test/skia_common.cc b/cc/test/skia_common.cc index d91e707..1ccb2d1 100644 --- a/cc/test/skia_common.cc +++ b/cc/test/skia_common.cc @@ -7,7 +7,7 @@ #include "cc/resources/picture.h" #include "skia/ext/refptr.h" #include "third_party/skia/include/core/SkCanvas.h" -#include "ui/gfx/rect.h" +#include "ui/gfx/geometry/rect.h" #include "ui/gfx/skia_util.h" namespace cc { diff --git a/cc/test/solid_color_content_layer_client.cc b/cc/test/solid_color_content_layer_client.cc index 7199f36..237dbb6 100644 --- a/cc/test/solid_color_content_layer_client.cc +++ b/cc/test/solid_color_content_layer_client.cc @@ -6,8 +6,8 @@ #include "third_party/skia/include/core/SkCanvas.h" #include "third_party/skia/include/core/SkPaint.h" -#include "ui/gfx/rect.h" -#include "ui/gfx/rect_f.h" +#include "ui/gfx/geometry/rect.h" +#include "ui/gfx/geometry/rect_f.h" namespace cc { diff --git a/cc/test/test_texture.h b/cc/test/test_texture.h index 0e50bf0..9265589 100644 --- a/cc/test/test_texture.h +++ b/cc/test/test_texture.h @@ -10,7 +10,7 @@ #include "base/memory/scoped_ptr.h" #include "cc/resources/resource_format.h" #include "third_party/khronos/GLES2/gl2.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace cc { diff --git a/cc/test/test_web_graphics_context_3d.h b/cc/test/test_web_graphics_context_3d.h index 0dfba9d..eda6f0f 100644 --- a/cc/test/test_web_graphics_context_3d.h +++ b/cc/test/test_web_graphics_context_3d.h @@ -20,7 +20,7 @@ #include "cc/test/ordered_texture_map.h" #include "cc/test/test_texture.h" #include "third_party/khronos/GLES2/gl2.h" -#include "ui/gfx/rect.h" +#include "ui/gfx/geometry/rect.h" extern "C" typedef struct _ClientBuffer* ClientBuffer; diff --git a/cc/test/tiled_layer_test_common.h b/cc/test/tiled_layer_test_common.h index 18b9817..abf2de4 100644 --- a/cc/test/tiled_layer_test_common.h +++ b/cc/test/tiled_layer_test_common.h @@ -12,8 +12,8 @@ #include "cc/resources/prioritized_resource.h" #include "cc/resources/resource_provider.h" #include "cc/resources/resource_update_queue.h" -#include "ui/gfx/rect.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/rect.h" +#include "ui/gfx/geometry/size.h" namespace cc { diff --git a/cc/trees/damage_tracker.h b/cc/trees/damage_tracker.h index 37c4c6e..aafbd03 100644 --- a/cc/trees/damage_tracker.h +++ b/cc/trees/damage_tracker.h @@ -9,7 +9,7 @@ #include "base/memory/scoped_ptr.h" #include "cc/base/cc_export.h" #include "cc/layers/layer_lists.h" -#include "ui/gfx/rect.h" +#include "ui/gfx/geometry/rect.h" class SkImageFilter; diff --git a/cc/trees/layer_sorter.h b/cc/trees/layer_sorter.h index fd1c72e..b783ded 100644 --- a/cc/trees/layer_sorter.h +++ b/cc/trees/layer_sorter.h @@ -11,10 +11,10 @@ #include "base/containers/hash_tables.h" #include "cc/base/cc_export.h" #include "cc/layers/layer_impl.h" +#include "ui/gfx/geometry/point3_f.h" +#include "ui/gfx/geometry/quad_f.h" +#include "ui/gfx/geometry/rect_f.h" #include "ui/gfx/geometry/vector3d_f.h" -#include "ui/gfx/point3_f.h" -#include "ui/gfx/quad_f.h" -#include "ui/gfx/rect_f.h" namespace gfx { class Transform; diff --git a/cc/trees/layer_tree_host.cc b/cc/trees/layer_tree_host.cc index 08fb810..7e17fef 100644 --- a/cc/trees/layer_tree_host.cc +++ b/cc/trees/layer_tree_host.cc @@ -40,7 +40,7 @@ #include "cc/trees/single_thread_proxy.h" #include "cc/trees/thread_proxy.h" #include "cc/trees/tree_synchronizer.h" -#include "ui/gfx/size_conversions.h" +#include "ui/gfx/geometry/size_conversions.h" namespace { static base::StaticAtomicSequenceNumber s_layer_tree_host_sequence_number; diff --git a/cc/trees/layer_tree_host.h b/cc/trees/layer_tree_host.h index aede050..b312e50 100644 --- a/cc/trees/layer_tree_host.h +++ b/cc/trees/layer_tree_host.h @@ -39,7 +39,7 @@ #include "cc/trees/layer_tree_settings.h" #include "cc/trees/proxy.h" #include "third_party/skia/include/core/SkColor.h" -#include "ui/gfx/rect.h" +#include "ui/gfx/geometry/rect.h" namespace cc { class AnimationRegistrar; diff --git a/cc/trees/layer_tree_host_common.cc b/cc/trees/layer_tree_host_common.cc index 4e80fc6..fd15b52 100644 --- a/cc/trees/layer_tree_host_common.cc +++ b/cc/trees/layer_tree_host_common.cc @@ -16,7 +16,7 @@ #include "cc/layers/render_surface_impl.h" #include "cc/trees/layer_sorter.h" #include "cc/trees/layer_tree_impl.h" -#include "ui/gfx/rect_conversions.h" +#include "ui/gfx/geometry/rect_conversions.h" #include "ui/gfx/transform.h" namespace cc { diff --git a/cc/trees/layer_tree_host_common.h b/cc/trees/layer_tree_host_common.h index d4c09c6..089fe29 100644 --- a/cc/trees/layer_tree_host_common.h +++ b/cc/trees/layer_tree_host_common.h @@ -13,9 +13,9 @@ #include "cc/base/cc_export.h" #include "cc/base/scoped_ptr_vector.h" #include "cc/layers/layer_lists.h" -#include "ui/gfx/rect.h" +#include "ui/gfx/geometry/rect.h" +#include "ui/gfx/geometry/vector2d.h" #include "ui/gfx/transform.h" -#include "ui/gfx/vector2d.h" namespace cc { diff --git a/cc/trees/layer_tree_host_common_unittest.cc b/cc/trees/layer_tree_host_common_unittest.cc index 99e479a..e0436ba 100644 --- a/cc/trees/layer_tree_host_common_unittest.cc +++ b/cc/trees/layer_tree_host_common_unittest.cc @@ -33,7 +33,7 @@ #include "cc/trees/single_thread_proxy.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" -#include "ui/gfx/quad_f.h" +#include "ui/gfx/geometry/quad_f.h" #include "ui/gfx/transform.h" namespace cc { diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc index 4ccc5fe..914d993 100644 --- a/cc/trees/layer_tree_host_impl.cc +++ b/cc/trees/layer_tree_host_impl.cc @@ -72,8 +72,8 @@ #include "gpu/GLES2/gl2extchromium.h" #include "ui/gfx/frame_time.h" #include "ui/gfx/geometry/rect_conversions.h" -#include "ui/gfx/size_conversions.h" -#include "ui/gfx/vector2d_conversions.h" +#include "ui/gfx/geometry/size_conversions.h" +#include "ui/gfx/geometry/vector2d_conversions.h" namespace cc { namespace { diff --git a/cc/trees/layer_tree_host_impl.h b/cc/trees/layer_tree_host_impl.h index a6448c1..1fc0989 100644 --- a/cc/trees/layer_tree_host_impl.h +++ b/cc/trees/layer_tree_host_impl.h @@ -35,7 +35,7 @@ #include "cc/scheduler/draw_result.h" #include "skia/ext/refptr.h" #include "third_party/skia/include/core/SkColor.h" -#include "ui/gfx/rect.h" +#include "ui/gfx/geometry/rect.h" namespace cc { diff --git a/cc/trees/layer_tree_host_impl_unittest.cc b/cc/trees/layer_tree_host_impl_unittest.cc index 5e51cc3..3c55544 100644 --- a/cc/trees/layer_tree_host_impl_unittest.cc +++ b/cc/trees/layer_tree_host_impl_unittest.cc @@ -61,9 +61,9 @@ #include "testing/gtest/include/gtest/gtest.h" #include "third_party/skia/include/core/SkMallocPixelRef.h" #include "ui/gfx/frame_time.h" -#include "ui/gfx/rect_conversions.h" -#include "ui/gfx/size_conversions.h" -#include "ui/gfx/vector2d_conversions.h" +#include "ui/gfx/geometry/rect_conversions.h" +#include "ui/gfx/geometry/size_conversions.h" +#include "ui/gfx/geometry/vector2d_conversions.h" using ::testing::Mock; using ::testing::Return; diff --git a/cc/trees/layer_tree_host_pixeltest_on_demand_raster.cc b/cc/trees/layer_tree_host_pixeltest_on_demand_raster.cc index 7209e06..74e20f5 100644 --- a/cc/trees/layer_tree_host_pixeltest_on_demand_raster.cc +++ b/cc/trees/layer_tree_host_pixeltest_on_demand_raster.cc @@ -11,8 +11,8 @@ #include "cc/trees/layer_tree_impl.h" #include "third_party/skia/include/core/SkCanvas.h" #include "third_party/skia/include/core/SkColor.h" -#include "ui/gfx/rect.h" -#include "ui/gfx/rect_f.h" +#include "ui/gfx/geometry/rect.h" +#include "ui/gfx/geometry/rect_f.h" #if !defined(OS_ANDROID) diff --git a/cc/trees/layer_tree_host_unittest.cc b/cc/trees/layer_tree_host_unittest.cc index 8fb9b8c..8d554dc 100644 --- a/cc/trees/layer_tree_host_unittest.cc +++ b/cc/trees/layer_tree_host_unittest.cc @@ -55,9 +55,9 @@ #include "third_party/khronos/GLES2/gl2ext.h" #include "third_party/skia/include/core/SkPicture.h" #include "ui/gfx/frame_time.h" -#include "ui/gfx/point_conversions.h" -#include "ui/gfx/size_conversions.h" -#include "ui/gfx/vector2d_conversions.h" +#include "ui/gfx/geometry/point_conversions.h" +#include "ui/gfx/geometry/size_conversions.h" +#include "ui/gfx/geometry/vector2d_conversions.h" using testing::_; using testing::AnyNumber; diff --git a/cc/trees/layer_tree_host_unittest_scroll.cc b/cc/trees/layer_tree_host_unittest_scroll.cc index c4f2eb3..e922f21 100644 --- a/cc/trees/layer_tree_host_unittest_scroll.cc +++ b/cc/trees/layer_tree_host_unittest_scroll.cc @@ -16,9 +16,9 @@ #include "cc/test/layer_tree_test.h" #include "cc/test/test_shared_bitmap_manager.h" #include "cc/trees/layer_tree_impl.h" -#include "ui/gfx/point_conversions.h" -#include "ui/gfx/size_conversions.h" -#include "ui/gfx/vector2d_conversions.h" +#include "ui/gfx/geometry/point_conversions.h" +#include "ui/gfx/geometry/size_conversions.h" +#include "ui/gfx/geometry/vector2d_conversions.h" namespace cc { namespace { diff --git a/cc/trees/layer_tree_impl.cc b/cc/trees/layer_tree_impl.cc index 206ec60..8f2f013 100644 --- a/cc/trees/layer_tree_impl.cc +++ b/cc/trees/layer_tree_impl.cc @@ -27,9 +27,9 @@ #include "cc/trees/layer_tree_host_common.h" #include "cc/trees/layer_tree_host_impl.h" #include "cc/trees/occlusion_tracker.h" -#include "ui/gfx/point_conversions.h" -#include "ui/gfx/size_conversions.h" -#include "ui/gfx/vector2d_conversions.h" +#include "ui/gfx/geometry/point_conversions.h" +#include "ui/gfx/geometry/size_conversions.h" +#include "ui/gfx/geometry/vector2d_conversions.h" namespace cc { diff --git a/cc/trees/layer_tree_impl_unittest.cc b/cc/trees/layer_tree_impl_unittest.cc index 7fc1645..f8de8b0 100644 --- a/cc/trees/layer_tree_impl_unittest.cc +++ b/cc/trees/layer_tree_impl_unittest.cc @@ -13,7 +13,7 @@ #include "cc/test/layer_tree_host_common_test.h" #include "cc/test/test_shared_bitmap_manager.h" #include "cc/trees/layer_tree_host_impl.h" -#include "ui/gfx/size_conversions.h" +#include "ui/gfx/geometry/size_conversions.h" namespace cc { namespace { diff --git a/cc/trees/layer_tree_settings.h b/cc/trees/layer_tree_settings.h index fff1084..30fa8cb 100644 --- a/cc/trees/layer_tree_settings.h +++ b/cc/trees/layer_tree_settings.h @@ -9,7 +9,7 @@ #include "cc/base/cc_export.h" #include "cc/debug/layer_tree_debug_state.h" #include "third_party/skia/include/core/SkColor.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace cc { diff --git a/cc/trees/occlusion.cc b/cc/trees/occlusion.cc index 70ee32c..14168f9 100644 --- a/cc/trees/occlusion.cc +++ b/cc/trees/occlusion.cc @@ -5,7 +5,7 @@ #include "cc/trees/occlusion.h" #include "cc/base/math_util.h" -#include "ui/gfx/rect.h" +#include "ui/gfx/geometry/rect.h" namespace cc { diff --git a/cc/trees/occlusion.h b/cc/trees/occlusion.h index 6d1e5b1..56f9962d 100644 --- a/cc/trees/occlusion.h +++ b/cc/trees/occlusion.h @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "cc/base/cc_export.h" #include "cc/base/simple_enclosed_region.h" -#include "ui/gfx/rect.h" +#include "ui/gfx/geometry/rect.h" #include "ui/gfx/transform.h" namespace cc { diff --git a/cc/trees/occlusion_tracker.cc b/cc/trees/occlusion_tracker.cc index 7d90834..bce1fd5 100644 --- a/cc/trees/occlusion_tracker.cc +++ b/cc/trees/occlusion_tracker.cc @@ -12,8 +12,8 @@ #include "cc/layers/layer_impl.h" #include "cc/layers/render_surface.h" #include "cc/layers/render_surface_impl.h" -#include "ui/gfx/quad_f.h" -#include "ui/gfx/rect_conversions.h" +#include "ui/gfx/geometry/quad_f.h" +#include "ui/gfx/geometry/rect_conversions.h" namespace cc { diff --git a/cc/trees/occlusion_tracker.h b/cc/trees/occlusion_tracker.h index b96752c..4d6555a 100644 --- a/cc/trees/occlusion_tracker.h +++ b/cc/trees/occlusion_tracker.h @@ -12,7 +12,7 @@ #include "cc/base/simple_enclosed_region.h" #include "cc/layers/layer_iterator.h" #include "cc/trees/occlusion.h" -#include "ui/gfx/rect.h" +#include "ui/gfx/geometry/rect.h" namespace cc { class LayerImpl; |